From 646cd6752c6ed88315b04fefc5f28a6b933415f4 Mon Sep 17 00:00:00 2001
From: Aizizi Yigaimu <seniordevone@Aizizis-MBP.fios-router.home>
Date: Thu, 5 Mar 2020 16:25:38 -0500
Subject: [PATCH 1/4] Refactor PNA test code

---
 .../apps/pna/features/downloadReport.feature  | 16 ++++++
 bloclink/apps/pna/features/environment.py     |  3 +-
 .../apps/pna/features/generateReport.feature  | 16 ++++++
 .../pna/features/loadQuestionnaire.feature    | 18 +++++++
 .../apps/pna/features/steps/downloadReport.py | 28 ++++++++++
 .../apps/pna/features/steps/generateReport.py | 28 ++++++++++
 .../pna/features/steps/loadQuestionnaire.py   | 36 +++++++++++++
 .../pna/features/steps/submitQuestionnaire.py | 49 ++++-------------
 .../pna/features/submitQuestionnaire.feature  | 54 ++++---------------
 9 files changed, 163 insertions(+), 85 deletions(-)
 create mode 100644 bloclink/apps/pna/features/downloadReport.feature
 create mode 100644 bloclink/apps/pna/features/generateReport.feature
 create mode 100644 bloclink/apps/pna/features/loadQuestionnaire.feature
 create mode 100644 bloclink/apps/pna/features/steps/downloadReport.py
 create mode 100644 bloclink/apps/pna/features/steps/generateReport.py
 create mode 100644 bloclink/apps/pna/features/steps/loadQuestionnaire.py

diff --git a/bloclink/apps/pna/features/downloadReport.feature b/bloclink/apps/pna/features/downloadReport.feature
new file mode 100644
index 0000000..91baa74
--- /dev/null
+++ b/bloclink/apps/pna/features/downloadReport.feature
@@ -0,0 +1,16 @@
+Feature: A building owner can submit questionnaire
+
+  @load_questionnaire_inputs
+  Scenario Outline: User can generate report
+      Given I have the building <buildingId>
+      When I click the submit button in Dashboard
+      Then the page should contain <button> button
+
+      Examples: Building has invalid inputs
+        | buildingId | button |
+        | 54321 | submit |
+        | 152699 | submit |
+
+      Examples: Building has valid inputs
+        | buildingId | button |
+        | 181794 | generate |
diff --git a/bloclink/apps/pna/features/environment.py b/bloclink/apps/pna/features/environment.py
index a9bc8de..d7e89d2 100644
--- a/bloclink/apps/pna/features/environment.py
+++ b/bloclink/apps/pna/features/environment.py
@@ -13,13 +13,14 @@ def load_questionnaire_inputs(context):
         context.inputs = json.load(outfile)[0]
 
 def before_tag(context, tag):
-    if tag == "load_questionnaire_inputs":
+    if tag == "load.questionnaire.inputs":
         use_fixture(load_questionnaire_inputs, context)
 
 def before_all(context):
     prefix = 'http://' if config('ENVIRONMENT') == 'local' else 'https://'
     context.basePath = prefix + config('DOMAIN') + '/buildings/'
     context.endpoints = {
+        'loadQuestionnaire' : '/pna/questionnaire/',
         'submitQuestionnaire' : '/pna/questionnaire/',
         'generateReport' : '/pna/report/generate/',
         'downloadReport' : '/pna/report/download/',
diff --git a/bloclink/apps/pna/features/generateReport.feature b/bloclink/apps/pna/features/generateReport.feature
new file mode 100644
index 0000000..00627b2
--- /dev/null
+++ b/bloclink/apps/pna/features/generateReport.feature
@@ -0,0 +1,16 @@
+Feature: A building owner can submit questionnaire
+
+  @load_questionnaire_inputs
+  Scenario Outline: User can download report
+      Given I have the building <buildingId>
+      When I click the submit button in Dashboard
+      Then the page should contain <button> button
+
+      Examples: Building has invalid inputs
+        | buildingId | button |
+        | 54321 | submit |
+        | 152699 | submit |
+
+      Examples: Building has valid inputs
+        | buildingId | button |
+        | 181794 | generate |
diff --git a/bloclink/apps/pna/features/loadQuestionnaire.feature b/bloclink/apps/pna/features/loadQuestionnaire.feature
new file mode 100644
index 0000000..0aafc0f
--- /dev/null
+++ b/bloclink/apps/pna/features/loadQuestionnaire.feature
@@ -0,0 +1,18 @@
+Feature: A building owner can load questionnaire
+
+  Scenario Outline: User can load questionnaire
+      Given I have the building <buildingId>
+      When I load the questionnaire in Dashboard
+      Then the page should contain <button> button
+
+      Examples: User has not submitted questionnaire
+        | buildingId | button |
+        | 54321 | submit |
+
+      Examples: User has submitted questionnaire, not calculated the report
+        | buildingId | button |
+        | 54321 | generate |
+
+      Examples: User has submitted questionnaire, and calculated the report
+        | buildingId | button |
+        | 54321 | download |
diff --git a/bloclink/apps/pna/features/steps/downloadReport.py b/bloclink/apps/pna/features/steps/downloadReport.py
new file mode 100644
index 0000000..58db544
--- /dev/null
+++ b/bloclink/apps/pna/features/steps/downloadReport.py
@@ -0,0 +1,28 @@
+from behave import *
+import requests
+import json
+
+
+@when('I click the download button in Dashboard')
+def step_impl(context):
+    response = requests.get(url=context.basePath+context.buildingId+context.endpoints['downloadReport'])
+    context.code = str(response.status_code)
+    try:
+        response_obj = json.loads(response.text)
+        context.success = str(response_obj['success'])
+        context.fieldnames = response_obj.keys()
+    except:
+        context.success = "False"
+        context.fieldnames = []
+
+@then('Report download should {result}')
+def step_impl(context):
+    if button == 'succeed':
+        assert context.code == "200"
+        assert context.success == "True"
+        assert context.fieldnames != []
+
+    if result == 'fail':
+        assert context.success == "False"
+        assert context.fieldnames == []
+
diff --git a/bloclink/apps/pna/features/steps/generateReport.py b/bloclink/apps/pna/features/steps/generateReport.py
new file mode 100644
index 0000000..c99d030
--- /dev/null
+++ b/bloclink/apps/pna/features/steps/generateReport.py
@@ -0,0 +1,28 @@
+from behave import *
+import requests
+import json
+
+
+@when('I click the generate button in Dashboard')
+def step_impl(context):
+    response = requests.get(url=context.basePath+context.buildingId+context.endpoints['generateReport'])
+    context.code = str(response.status_code)
+    try:
+        response_obj = json.loads(response.text)
+        context.success = str(response_obj['success'])
+        context.fieldnames = response_obj.keys()
+    except:
+        context.success = "False"
+        context.fieldnames = []
+
+@then('Report generation should {result}')
+def step_impl(context):
+    if button == 'succeed':
+        assert context.code == "200"
+        assert context.success == "True"
+        assert context.fieldnames != []
+
+    if button == 'fail':
+        assert context.success == "False"
+        assert context.fieldnames == []
+
diff --git a/bloclink/apps/pna/features/steps/loadQuestionnaire.py b/bloclink/apps/pna/features/steps/loadQuestionnaire.py
new file mode 100644
index 0000000..ea60d0f
--- /dev/null
+++ b/bloclink/apps/pna/features/steps/loadQuestionnaire.py
@@ -0,0 +1,36 @@
+from behave import *
+import requests
+import json
+
+
+@given('I have the building {buildingId}')
+def step_impl(context, buildingId):
+    context.buildingId = buildingId
+
+@when('I load the questionnaire in Dashboard')
+def step_impl(context):
+    response = requests.get(url=context.basePath+context.buildingId+context.endpoints['loadQuestionnaire'])
+    context.code = str(response.status_code)
+    try:
+        response_obj = json.loads(response.text)
+        context.submitted = str(response_obj['submitted'])
+        context.calculated = str(response_obj['calculated'])
+    except:
+        context.submitted = "False"
+        context.calculated = "False"
+
+@then('Result page should contain {button} button')
+def step_impl(context, code):
+    assert context.code == "200"
+
+    if button == 'submit':
+        assert context.submitted == "False"
+        assert context.calculated == "False"
+
+    if button == 'generate':
+        assert context.submitted == "True"
+        assert context.calculated == "False"
+
+    if button == 'download':
+        assert context.submitted == "True"
+        assert context.calculated == "True"
diff --git a/bloclink/apps/pna/features/steps/submitQuestionnaire.py b/bloclink/apps/pna/features/steps/submitQuestionnaire.py
index 1f46dae..e36d6a5 100644
--- a/bloclink/apps/pna/features/steps/submitQuestionnaire.py
+++ b/bloclink/apps/pna/features/steps/submitQuestionnaire.py
@@ -3,30 +3,7 @@ import requests
 import json
 
 
-@given('I have the building {buildingId}')
-def step_impl(context, buildingId):
-    context.buildingId = buildingId
-
-@when('I load the questionnaire')
-def step_impl(context):
-    response = requests.get(url=context.basePath+context.buildingId+context.endpoints['submitQuestionnaire'])
-    context.code = str(response.status_code)
-    try:
-        response_obj = json.loads(response.text)
-        context.submitted = str(response_obj['submitted'])
-        context.calculated = str(response_obj['calculated'])
-        context.fieldnames = response_obj.keys()
-    except:
-        context.submitted = "False"
-        context.calculated = "False"
-        context.fieldnames = []
-
-    try:
-        context.success = str(response_obj['success'])
-    except:
-        context.success = 'True'
-
-@when('I click the submit button')
+@when('I click the submit button in Dashboard')
 def step_impl(context):
     # Fill out building ID
     buildingInfo = context.inputs['buildingInfo']
@@ -42,23 +19,15 @@ def step_impl(context):
         context.success = "False"
         context.fieldnames = []
 
-@then('result should include code {code}')
+@then('the page should contain {button} button')
 def step_impl(context, code):
-    assert code == context.code
-
-@then('result should include success as {success}')
-def step_impl(context, success):
-    assert success == context.success
+    assert context.code == "200"
 
-@then('result should include field names {fieldnames}')
-def step_impl(context, fieldnames):
-    for fieldname in fieldnames.split(','):
-        assert fieldname in context.fieldnames
+    if button == 'submit':
+        assert context.success == "False"
+        assert context.fieldnames == []
 
-@then('result should include submitted field as {submitted}')
-def step_impl(context, submitted):
-    assert submitted == context.submitted
+    if button == 'generate':
+        assert context.success == "True"
+        assert context.fieldnames != []
 
-@then('result should include calculated field as {calculated}')
-def step_impl(context, calculated):
-    assert submitted == context.calculated
diff --git a/bloclink/apps/pna/features/submitQuestionnaire.feature b/bloclink/apps/pna/features/submitQuestionnaire.feature
index 9168430..16d01d0 100644
--- a/bloclink/apps/pna/features/submitQuestionnaire.feature
+++ b/bloclink/apps/pna/features/submitQuestionnaire.feature
@@ -1,50 +1,16 @@
 Feature: A building owner can submit questionnaire
 
-  Scenario Outline: User can load questionnaire
-      Given I have the building <buildingId>
-      When I load the questionnaire
-      Then result should include code <code>
-      And result should include field names <fieldNames>
-      And result should include submitted field as <submitted>
-
-      Examples: Building not exist
-        | buildingId | code |
-        | 16998888 | 500 |
-
-      Examples: Building has no questionnaire submitted
-        | buildingId | code | fieldNames | submitted |
-        | 152699 | 200 | buildingInfo,submittedAnswers,answers,submitted,calculated | False |
-
-      Examples: Building has questionnaire submitted
-        | buildingId | code | fieldNames | submitted |
-        | 54321 | 200 | buildingInfo,submittedAnswers,answers,submitted,calculated | False |
-        | 181794 | 200 | buildingInfo,submittedAnswers,answers,submitted,calculated | True |
-
-      Examples: Building report has not calculated
-        | buildingId | code | fieldNames | submitted | calculated |
-        | 54321 | 200 | buildingInfo,submittedAnswers,answers,submitted,calculated | False | False |
-
-      Examples: Building report has calculated
-        | buildingId | code | fieldNames | submitted | calculated |
-        | 54321 | 200 | buildingInfo,submittedAnswers,answers,submitted,calculated | False | True |
-
-  @load_questionnaire_inputs
+  @load.questionnaire.inputs
   Scenario Outline: User can submit questionnaire
       Given I have the building <buildingId>
-      When I click the submit button
-      Then result should include code <code>
-      And result should include success as <success>
-      And result should include field names <fieldNames>
-
-      Examples: Building not exist
-        | buildingId | code | fieldNames | success |
-        | 1699888 | 500 |  | False |
+      When I click the submit button in Dashboard
+      Then the page should contain <button> button
 
-      Examples: Building has no questionnaire submitted
-        | buildingId | code | fieldNames | success |
-        | 54321 | 200 | message,answers | True |
-        | 152699 | 200 | message,answers | True |
+      Examples: Building has invalid inputs
+        | buildingId | button |
+        | 54321 | submit |
+        | 152699 | submit |
 
-      Examples: Building has questionnaire submitted
-        | buildingId | code | fieldNames | success |
-        | 181794 | 200 | message,answers | True |
+      Examples: Building has valid inputs
+        | buildingId | button |
+        | 181794 | generate |
-- 
GitLab


From 99cf3d82815a772e50ce4be4d2849c49abd7ddb5 Mon Sep 17 00:00:00 2001
From: Aizizi Yigaimu <seniordevone@Aizizis-MBP.fios-router.home>
Date: Thu, 5 Mar 2020 16:58:09 -0500
Subject: [PATCH 2/4] Update wrong names

---
 ...ta.non_exist_building.json => inputs.json} |   0
 .../data/questionnaire_data_default.json      | 147 ------------------
 .../apps/pna/features/downloadReport.feature  |  16 +-
 bloclink/apps/pna/features/environment.py     |   2 +-
 .../apps/pna/features/generateReport.feature  |  14 +-
 .../apps/pna/features/steps/downloadReport.py |   8 +-
 .../apps/pna/features/steps/generateReport.py |  10 +-
 .../pna/features/steps/loadQuestionnaire.py   |   2 +-
 .../pna/features/steps/submitQuestionnaire.py |   4 +-
 .../pna/features/submitQuestionnaire.feature  |   2 +-
 10 files changed, 29 insertions(+), 176 deletions(-)
 rename bloclink/apps/pna/features/data/{questionnaire_data.non_exist_building.json => inputs.json} (100%)
 delete mode 100644 bloclink/apps/pna/features/data/questionnaire_data_default.json

diff --git a/bloclink/apps/pna/features/data/questionnaire_data.non_exist_building.json b/bloclink/apps/pna/features/data/inputs.json
similarity index 100%
rename from bloclink/apps/pna/features/data/questionnaire_data.non_exist_building.json
rename to bloclink/apps/pna/features/data/inputs.json
diff --git a/bloclink/apps/pna/features/data/questionnaire_data_default.json b/bloclink/apps/pna/features/data/questionnaire_data_default.json
deleted file mode 100644
index bac05b3..0000000
--- a/bloclink/apps/pna/features/data/questionnaire_data_default.json
+++ /dev/null
@@ -1,147 +0,0 @@
-[
-    {
-        "buildingInfo": {
-            "building_id": "",
-            "firstName": "",
-            "lastName": "",
-            "email": "",
-            "phone": "",
-            "address": "",
-            "buildingSqFt": "",
-            "numberOfFloors": "",
-            "unitInfo": {
-                "studio": "",
-                "oneBedroom": "",
-                "twoBedroom": "",
-                "threeBedroom": "",
-                "fourBedroom": "",
-                "other": "",
-                "numOfOther": ""
-            }
-        },
-        "remoteSurvey": {
-            "heatingSystem": {
-                "question_id": "",
-                "question": "",
-                "answer_id": ""
-            },
-            "heatingFuelSource": {
-                "question_id": "",
-                "question": "",
-                "answer_id": ""
-            },
-            "DHWSameBoiler": {
-                "question_id": "",
-                "question": "",
-                "answer_id": ""
-            },
-            "ownerPayOwnElectricBill": {
-                "question_id": "",
-                "question": "",
-                "answer_id": ""
-            },
-            "accessibleByStairwell": {
-                "question_id": "",
-                "question": "",
-                "answer_id": ""
-            },
-            "meteredForElectricity": {
-                "question_id": "",
-                "question": "",
-                "answer_id": ""
-            },
-            "ageOfHeatGenerateSystem": {
-                "question_id": "",
-                "question": "",
-                "answer_id": ""
-            },
-            "tenantComplaintsWindows": {
-                "question_id": "",
-                "question": "",
-                "answer_id": ""
-            },
-            "stairwellsHeated": {
-                "question_id": "",
-                "question": "",
-                "answer_id": ""
-            },
-            "hallwaysHeated": {
-                "question_id": "",
-                "question": "",
-                "answer_id": ""
-            },
-            "basementHeated": {
-                "question_id": "",
-                "question": "",
-                "answer_id": ""
-            },
-            "tenantComplaintsComfort": {
-                "question_id": "",
-                "question": "",
-                "answer_id": ""
-            },
-            "planToReplaceHS": {
-                "question_id": "",
-                "question":  "",
-                "answer_id": ""
-            },
-            "backFacadeAttached": {
-                "question_id": "",
-                "question": "",
-                "answer_id": ""
-            },
-            "exteriorWallsAttached": {
-                "question_id": "",
-                "question": "",
-                "answer_id": ""
-            },
-            "floorsHeated": {
-                "question_id": "",
-                "question": "",
-                "answer_id": ""
-            },
-            "numberOfHeatingViolations": {
-                "question_id": "",
-                "question": "",
-                "answer_id": ""
-            }
-        },
-        "financialInitials": {
-            "bankruptcyPast": {
-                "question_id": "",
-                "question": "",
-                "answer_id": ""
-            },
-            "currentOnEnergyBills": {
-                "question_id": "",
-                "question": "",
-                "answer_id": ""
-            },
-            "currentMortgageBalance": {
-                "question_id": "",
-                "question": "",
-                "answer_id": ""
-            },
-            "profitable": {
-                "question_id": "",
-                "question": "",
-                "answer_id": ""
-            },
-            "budgetForDownPayment": {
-                "question_id": "",
-                "question": "",
-                "answer_id": ""
-            },
-            "legalOwnership": {
-                "question_id": "",
-                "question": "",
-                "answer_id": ""
-            },
-            "numberOfDobViolations": {
-                "question_id": "",
-                "question": "",
-                "answer_id": ""
-            }
-        }
-    }
-]
diff --git a/bloclink/apps/pna/features/downloadReport.feature b/bloclink/apps/pna/features/downloadReport.feature
index 91baa74..7580af6 100644
--- a/bloclink/apps/pna/features/downloadReport.feature
+++ b/bloclink/apps/pna/features/downloadReport.feature
@@ -1,16 +1,16 @@
 Feature: A building owner can submit questionnaire
 
   @load_questionnaire_inputs
-  Scenario Outline: User can generate report
+  Scenario Outline: User can download report
       Given I have the building <buildingId>
-      When I click the submit button in Dashboard
-      Then the page should contain <button> button
+      When I click download button in Dashboard
+      Then report download should <result>
 
       Examples: Building has invalid inputs
-        | buildingId | button |
-        | 54321 | submit |
-        | 152699 | submit |
+        | buildingId | fail |
+        | 181794 | fail |
 
       Examples: Building has valid inputs
-        | buildingId | button |
-        | 181794 | generate |
+        | buildingId | result |
+        | 54321 | succeed |
+        | 152699 | succeed |
diff --git a/bloclink/apps/pna/features/environment.py b/bloclink/apps/pna/features/environment.py
index d7e89d2..9471e40 100644
--- a/bloclink/apps/pna/features/environment.py
+++ b/bloclink/apps/pna/features/environment.py
@@ -9,7 +9,7 @@ import requests
 
 @fixture
 def load_questionnaire_inputs(context):
-    with open('features/data/questionnaire_data.non_exist_building.json', 'r') as outfile:
+    with open('features/data/inputs.json', 'r') as outfile:
         context.inputs = json.load(outfile)[0]
 
 def before_tag(context, tag):
diff --git a/bloclink/apps/pna/features/generateReport.feature b/bloclink/apps/pna/features/generateReport.feature
index 00627b2..1a663d5 100644
--- a/bloclink/apps/pna/features/generateReport.feature
+++ b/bloclink/apps/pna/features/generateReport.feature
@@ -3,14 +3,14 @@ Feature: A building owner can submit questionnaire
   @load_questionnaire_inputs
   Scenario Outline: User can download report
       Given I have the building <buildingId>
-      When I click the submit button in Dashboard
-      Then the page should contain <button> button
+      When I click generate button in Dashboard
+      Then report generation should <result>
 
       Examples: Building has invalid inputs
-        | buildingId | button |
-        | 54321 | submit |
-        | 152699 | submit |
+        | buildingId | result |
+        | 54321 | fail |
+        | 152699 | fail |
 
       Examples: Building has valid inputs
-        | buildingId | button |
-        | 181794 | generate |
+        | buildingId | result |
+        | 181794 | succeed |
diff --git a/bloclink/apps/pna/features/steps/downloadReport.py b/bloclink/apps/pna/features/steps/downloadReport.py
index 58db544..82972c6 100644
--- a/bloclink/apps/pna/features/steps/downloadReport.py
+++ b/bloclink/apps/pna/features/steps/downloadReport.py
@@ -3,7 +3,7 @@ import requests
 import json
 
 
-@when('I click the download button in Dashboard')
+@when('I click download button in Dashboard')
 def step_impl(context):
     response = requests.get(url=context.basePath+context.buildingId+context.endpoints['downloadReport'])
     context.code = str(response.status_code)
@@ -15,9 +15,9 @@ def step_impl(context):
         context.success = "False"
         context.fieldnames = []
 
-@then('Report download should {result}')
-def step_impl(context):
-    if button == 'succeed':
+@then('report download should {result}')
+def step_impl(context, result):
+    if result == 'succeed':
         assert context.code == "200"
         assert context.success == "True"
         assert context.fieldnames != []
diff --git a/bloclink/apps/pna/features/steps/generateReport.py b/bloclink/apps/pna/features/steps/generateReport.py
index c99d030..4654ab1 100644
--- a/bloclink/apps/pna/features/steps/generateReport.py
+++ b/bloclink/apps/pna/features/steps/generateReport.py
@@ -3,7 +3,7 @@ import requests
 import json
 
 
-@when('I click the generate button in Dashboard')
+@when('I click generate button in Dashboard')
 def step_impl(context):
     response = requests.get(url=context.basePath+context.buildingId+context.endpoints['generateReport'])
     context.code = str(response.status_code)
@@ -15,14 +15,14 @@ def step_impl(context):
         context.success = "False"
         context.fieldnames = []
 
-@then('Report generation should {result}')
-def step_impl(context):
-    if button == 'succeed':
+@then('report generation should {result}')
+def step_impl(context, result):
+    if result == 'succeed':
         assert context.code == "200"
         assert context.success == "True"
         assert context.fieldnames != []
 
-    if button == 'fail':
+    if result == 'fail':
         assert context.success == "False"
         assert context.fieldnames == []
 
diff --git a/bloclink/apps/pna/features/steps/loadQuestionnaire.py b/bloclink/apps/pna/features/steps/loadQuestionnaire.py
index ea60d0f..b3513b1 100644
--- a/bloclink/apps/pna/features/steps/loadQuestionnaire.py
+++ b/bloclink/apps/pna/features/steps/loadQuestionnaire.py
@@ -20,7 +20,7 @@ def step_impl(context):
         context.calculated = "False"
 
 @then('Result page should contain {button} button')
-def step_impl(context, code):
+def step_impl(context, button):
     assert context.code == "200"
 
     if button == 'submit':
diff --git a/bloclink/apps/pna/features/steps/submitQuestionnaire.py b/bloclink/apps/pna/features/steps/submitQuestionnaire.py
index e36d6a5..ac31ad2 100644
--- a/bloclink/apps/pna/features/steps/submitQuestionnaire.py
+++ b/bloclink/apps/pna/features/steps/submitQuestionnaire.py
@@ -3,7 +3,7 @@ import requests
 import json
 
 
-@when('I click the submit button in Dashboard')
+@when('I click submit button in Dashboard')
 def step_impl(context):
     # Fill out building ID
     buildingInfo = context.inputs['buildingInfo']
@@ -20,7 +20,7 @@ def step_impl(context):
         context.fieldnames = []
 
 @then('the page should contain {button} button')
-def step_impl(context, code):
+def step_impl(context, button):
     assert context.code == "200"
 
     if button == 'submit':
diff --git a/bloclink/apps/pna/features/submitQuestionnaire.feature b/bloclink/apps/pna/features/submitQuestionnaire.feature
index 16d01d0..6a600fd 100644
--- a/bloclink/apps/pna/features/submitQuestionnaire.feature
+++ b/bloclink/apps/pna/features/submitQuestionnaire.feature
@@ -3,7 +3,7 @@ Feature: A building owner can submit questionnaire
   @load.questionnaire.inputs
   Scenario Outline: User can submit questionnaire
       Given I have the building <buildingId>
-      When I click the submit button in Dashboard
+      When I click submit button in Dashboard
       Then the page should contain <button> button
 
       Examples: Building has invalid inputs
-- 
GitLab


From 6a8d6303f78671f55e7eb81b04791538e3660e33 Mon Sep 17 00:00:00 2001
From: Aizizi Yigaimu <seniordevone@Aizizis-MBP.fios-router.home>
Date: Fri, 6 Mar 2020 14:22:21 -0500
Subject: [PATCH 3/4] Refactor code

---
 bloclink/apps/pna/features/data/inputs.json   | 288 +++++++++---------
 .../apps/pna/features/downloadReport.feature  |  16 -
 bloclink/apps/pna/features/environment.py     |   2 +-
 .../apps/pna/features/generateReport.feature  |  16 -
 .../pna/features/loadQuestionnaire.feature    |  18 --
 .../apps/pna/features/questionnaire.feature   |  33 ++
 bloclink/apps/pna/features/report.feature     |  29 ++
 .../apps/pna/features/steps/downloadReport.py |  28 --
 ...{loadQuestionnaire.py => questionnaire.py} |  30 +-
 .../steps/{generateReport.py => report.py}    |  15 +-
 .../pna/features/steps/submitQuestionnaire.py |  33 --
 .../pna/features/submitQuestionnaire.feature  |  16 -
 12 files changed, 249 insertions(+), 275 deletions(-)
 delete mode 100644 bloclink/apps/pna/features/downloadReport.feature
 delete mode 100644 bloclink/apps/pna/features/generateReport.feature
 delete mode 100644 bloclink/apps/pna/features/loadQuestionnaire.feature
 create mode 100644 bloclink/apps/pna/features/questionnaire.feature
 create mode 100644 bloclink/apps/pna/features/report.feature
 delete mode 100644 bloclink/apps/pna/features/steps/downloadReport.py
 rename bloclink/apps/pna/features/steps/{loadQuestionnaire.py => questionnaire.py} (50%)
 rename bloclink/apps/pna/features/steps/{generateReport.py => report.py} (58%)
 delete mode 100644 bloclink/apps/pna/features/steps/submitQuestionnaire.py
 delete mode 100644 bloclink/apps/pna/features/submitQuestionnaire.feature

diff --git a/bloclink/apps/pna/features/data/inputs.json b/bloclink/apps/pna/features/data/inputs.json
index 331068c..e5e42ec 100644
--- a/bloclink/apps/pna/features/data/inputs.json
+++ b/bloclink/apps/pna/features/data/inputs.json
@@ -1,147 +1,145 @@
-[
-    {
-        "buildingInfo": {
-            "building_id": "",
-            "firstName": "Jinalllll",
-            "lastName": "Soniiiii",
-            "email": "jinal@blocpower.io",
-            "phone": "333-333-2233",
-            "address": ["838888 PARK PLACE, BROOKLYN"],
-            "buildingSqFt": 3000,
-            "numberOfFloors": 3,
-            "unitInfo": {
-                "studio": 1,
-                "oneBedroom": 1,
-                "twoBedroom": 1,
-                "threeBedroom": 1,
-                "fourBedroom": 1,
-                "other": "other",
-                "numOfOther": 0
-            }
-        },
-        "remoteSurvey": {
-            "heatingSystem": {
-                "question_id": 1,
-                "question": "Heating System",
-                "answer_id": 3
-            },
-            "heatingFuelSource": {
-                "question_id": 2,
-                "question": "Heating Fuel Source",
-                "answer_id": 6
-            },
-            "DHWSameBoiler": {
-                "question_id": 3,
-                "question": "Is Domestic Hot Water (DHW) and heat prepared by the same boiler?",
-                "answer_id": 10
-            },
-            "ownerPayOwnElectricBill": {
-                "question_id": 16,
-                "question": "Do your tenants pay their own electricity bills?",
-                "answer_id": 9
-            },
-            "accessibleByStairwell": {
-                "question_id": 10,
-                "question": "Is the roof flat and easily accessible by a stairwell?",
-                "answer_id": 9
-            },
-            "meteredForElectricity": {
-                "question_id": 15,
-                "question": "Is the building direct metered for electricity (tenant pay ConEd bills)?",
-                "answer_id": 10
-            },
-            "ageOfHeatGenerateSystem": {
-                "question_id": 4,
-                "question": "Age of the heat generating system?",
-                "answer_id": 13
-            },
-            "tenantComplaintsWindows": {
-                "question_id": 14,
-                "question": "Any tenant complaints about drafty windows?",
-                "answer_id": 26
-            },
-            "stairwellsHeated": {
-                "question_id": 7,
-                "question": "Are the following building areas heated? (stairwells)",
-                "answer_id": 9
-            },
-            "hallwaysHeated": {
-                "question_id": 6,
-                "question": "Are the following building areas heated? (hallways)",
-                "answer_id": 10
-            },
-            "basementHeated": {
-                "question_id": 8,
-                "question": "Are the following building areas heated? (basement)",
-                "answer_id": 9
-            },
-            "tenantComplaintsComfort": {
-                "question_id": 13,
-                "question": "Any tenant complaints about comfort issues? (Temperature)",
-                "answer_id": 23
-            },
-            "planToReplaceHS": {
-                "question_id": 5,
-                "question":  "When do you plan to replace the heating system?",
-                "answer_id": 16
-            },
-            "backFacadeAttached": {
-                "question_id": 11,
-                "question": "Is the back facade of your building attached to an adjacent building or structure?",
-                "answer_id": 10
-            },
-            "exteriorWallsAttached": {
-                "question_id": 12,
-                "question": "Are the exterior walls of your building attached to an adjacent building or structure?",
-                "answer_id": 10
-            },
-            "floorsHeated": {
-                "question_id": 9,
-                "question": "Are the following building areas heated? (floors)",
-                "answer_id": 9
-            },
-            "numberOfHeatingViolations": {
-                "question_id": 23,
-                "question": "Number of heating violations in 5 years?",
-                "answer_id": 45
-            }
-        },
-        "financialInitials": {
-            "bankruptcyPast": {
-                "question_id": 17,
-                "question": "Any bankruptcy in the past three years?",
-                "answer_id": 10
-            },
-            "currentOnEnergyBills": {
-                "question_id": 18,
-                "question": "Current on energy bills?",
-                "answer_id": 30
-            },
-            "currentMortgageBalance": {
-                "question_id": 19,
-                "question": "What is the current outstanding balance of the mortgage?",
-                "answer_id": 34
-            },
-            "profitable": {
-                "question_id": 20,
-                "question": "Is your building currently profitable?",
-                "answer_id": 40
-            },
-            "budgetForDownPayment": {
-                "question_id": 21,
-                "question": "What is your current budget for a down payment?",
-                "answer_id": 41
-            },
-            "legalOwnership": {
-                "question_id": 22,
-                "question": "Legal Ownership",
-                "answer_id": 53
-            },
-            "numberOfDobViolations": {
-                "question_id": 24,
-                "question": "Number of DOB violations?",
-                "answer_id": 48
-            }
+{
+    "buildingInfo": {
+        "building_id": "",
+        "firstName": "Jinalllll",
+        "lastName": "Soniiiii",
+        "email": "jinal@blocpower.io",
+        "phone": "333-333-2233",
+        "address": ["838888 PARK PLACE, BROOKLYN"],
+        "buildingSqFt": 3000,
+        "numberOfFloors": 3,
+        "unitInfo": {
+            "studio": 1,
+            "oneBedroom": 1,
+            "twoBedroom": 1,
+            "threeBedroom": 1,
+            "fourBedroom": 1,
+            "other": "other",
+            "numOfOther": 0
+        }
+    },
+    "remoteSurvey": {
+        "heatingSystem": {
+            "question_id": 1,
+            "question": "Heating System",
+            "answer_id": 3
+        },
+        "heatingFuelSource": {
+            "question_id": 2,
+            "question": "Heating Fuel Source",
+            "answer_id": 6
+        },
+        "DHWSameBoiler": {
+            "question_id": 3,
+            "question": "Is Domestic Hot Water (DHW) and heat prepared by the same boiler?",
+            "answer_id": 10
+        },
+        "ownerPayOwnElectricBill": {
+            "question_id": 16,
+            "question": "Do your tenants pay their own electricity bills?",
+            "answer_id": 9
+        },
+        "accessibleByStairwell": {
+            "question_id": 10,
+            "question": "Is the roof flat and easily accessible by a stairwell?",
+            "answer_id": 9
+        },
+        "meteredForElectricity": {
+            "question_id": 15,
+            "question": "Is the building direct metered for electricity (tenant pay ConEd bills)?",
+            "answer_id": 10
+        },
+        "ageOfHeatGenerateSystem": {
+            "question_id": 4,
+            "question": "Age of the heat generating system?",
+            "answer_id": 13
+        },
+        "tenantComplaintsWindows": {
+            "question_id": 14,
+            "question": "Any tenant complaints about drafty windows?",
+            "answer_id": 26
+        },
+        "stairwellsHeated": {
+            "question_id": 7,
+            "question": "Are the following building areas heated? (stairwells)",
+            "answer_id": 9
+        },
+        "hallwaysHeated": {
+            "question_id": 6,
+            "question": "Are the following building areas heated? (hallways)",
+            "answer_id": 10
+        },
+        "basementHeated": {
+            "question_id": 8,
+            "question": "Are the following building areas heated? (basement)",
+            "answer_id": 9
+        },
+        "tenantComplaintsComfort": {
+            "question_id": 13,
+            "question": "Any tenant complaints about comfort issues? (Temperature)",
+            "answer_id": 23
+        },
+        "planToReplaceHS": {
+            "question_id": 5,
+            "question":  "When do you plan to replace the heating system?",
+            "answer_id": 16
+        },
+        "backFacadeAttached": {
+            "question_id": 11,
+            "question": "Is the back facade of your building attached to an adjacent building or structure?",
+            "answer_id": 10
+        },
+        "exteriorWallsAttached": {
+            "question_id": 12,
+            "question": "Are the exterior walls of your building attached to an adjacent building or structure?",
+            "answer_id": 10
+        },
+        "floorsHeated": {
+            "question_id": 9,
+            "question": "Are the following building areas heated? (floors)",
+            "answer_id": 9
+        },
+        "numberOfHeatingViolations": {
+            "question_id": 23,
+            "question": "Number of heating violations in 5 years?",
+            "answer_id": 45
+        }
+    },
+    "financialInitials": {
+        "bankruptcyPast": {
+            "question_id": 17,
+            "question": "Any bankruptcy in the past three years?",
+            "answer_id": 10
+        },
+        "currentOnEnergyBills": {
+            "question_id": 18,
+            "question": "Current on energy bills?",
+            "answer_id": 30
+        },
+        "currentMortgageBalance": {
+            "question_id": 19,
+            "question": "What is the current outstanding balance of the mortgage?",
+            "answer_id": 34
+        },
+        "profitable": {
+            "question_id": 20,
+            "question": "Is your building currently profitable?",
+            "answer_id": 40
+        },
+        "budgetForDownPayment": {
+            "question_id": 21,
+            "question": "What is your current budget for a down payment?",
+            "answer_id": 41
+        },
+        "legalOwnership": {
+            "question_id": 22,
+            "question": "Legal Ownership",
+            "answer_id": 53
+        },
+        "numberOfDobViolations": {
+            "question_id": 24,
+            "question": "Number of DOB violations?",
+            "answer_id": 48
         }
     }
-]
+}
diff --git a/bloclink/apps/pna/features/downloadReport.feature b/bloclink/apps/pna/features/downloadReport.feature
deleted file mode 100644
index 7580af6..0000000
--- a/bloclink/apps/pna/features/downloadReport.feature
+++ /dev/null
@@ -1,16 +0,0 @@
-Feature: A building owner can submit questionnaire
-
-  @load_questionnaire_inputs
-  Scenario Outline: User can download report
-      Given I have the building <buildingId>
-      When I click download button in Dashboard
-      Then report download should <result>
-
-      Examples: Building has invalid inputs
-        | buildingId | fail |
-        | 181794 | fail |
-
-      Examples: Building has valid inputs
-        | buildingId | result |
-        | 54321 | succeed |
-        | 152699 | succeed |
diff --git a/bloclink/apps/pna/features/environment.py b/bloclink/apps/pna/features/environment.py
index 9471e40..419fefd 100644
--- a/bloclink/apps/pna/features/environment.py
+++ b/bloclink/apps/pna/features/environment.py
@@ -10,7 +10,7 @@ import requests
 @fixture
 def load_questionnaire_inputs(context):
     with open('features/data/inputs.json', 'r') as outfile:
-        context.inputs = json.load(outfile)[0]
+        context.inputs = json.load(outfile)
 
 def before_tag(context, tag):
     if tag == "load.questionnaire.inputs":
diff --git a/bloclink/apps/pna/features/generateReport.feature b/bloclink/apps/pna/features/generateReport.feature
deleted file mode 100644
index 1a663d5..0000000
--- a/bloclink/apps/pna/features/generateReport.feature
+++ /dev/null
@@ -1,16 +0,0 @@
-Feature: A building owner can submit questionnaire
-
-  @load_questionnaire_inputs
-  Scenario Outline: User can download report
-      Given I have the building <buildingId>
-      When I click generate button in Dashboard
-      Then report generation should <result>
-
-      Examples: Building has invalid inputs
-        | buildingId | result |
-        | 54321 | fail |
-        | 152699 | fail |
-
-      Examples: Building has valid inputs
-        | buildingId | result |
-        | 181794 | succeed |
diff --git a/bloclink/apps/pna/features/loadQuestionnaire.feature b/bloclink/apps/pna/features/loadQuestionnaire.feature
deleted file mode 100644
index 0aafc0f..0000000
--- a/bloclink/apps/pna/features/loadQuestionnaire.feature
+++ /dev/null
@@ -1,18 +0,0 @@
-Feature: A building owner can load questionnaire
-
-  Scenario Outline: User can load questionnaire
-      Given I have the building <buildingId>
-      When I load the questionnaire in Dashboard
-      Then the page should contain <button> button
-
-      Examples: User has not submitted questionnaire
-        | buildingId | button |
-        | 54321 | submit |
-
-      Examples: User has submitted questionnaire, not calculated the report
-        | buildingId | button |
-        | 54321 | generate |
-
-      Examples: User has submitted questionnaire, and calculated the report
-        | buildingId | button |
-        | 54321 | download |
diff --git a/bloclink/apps/pna/features/questionnaire.feature b/bloclink/apps/pna/features/questionnaire.feature
new file mode 100644
index 0000000..c77fb5b
--- /dev/null
+++ b/bloclink/apps/pna/features/questionnaire.feature
@@ -0,0 +1,33 @@
+Feature: A building owner can load and submit questionnaire
+
+  Scenario Outline: User can load questionnaire
+      Given I have the building <buildingId>
+      When I load the questionnaire in Dashboard
+      Then load result page should contain <button> button
+
+      Examples: User has not submitted questionnaire
+        | buildingId | button |
+        | 12346 | submit |
+
+      Examples: User has submitted questionnaire, not calculated the report
+        | buildingId | button |
+        | 12345 | generate |
+
+      Examples: User has submitted questionnaire, and calculated the report
+        | buildingId | button |
+        | 54321 | download |
+
+  @load.questionnaire.inputs
+  Scenario Outline: User can submit questionnaire
+      Given I have the building <buildingId>
+      When I click submit button in Dashboard
+      Then submit result page should contain <button> button
+
+      Examples: Building has invalid inputs
+        | buildingId | button |
+        | 152699 | submit |
+
+      Examples: Building has valid inputs
+        | buildingId | button |
+        | 54321 | submit |
+        | 181794 | generate |
diff --git a/bloclink/apps/pna/features/report.feature b/bloclink/apps/pna/features/report.feature
new file mode 100644
index 0000000..75d0b8a
--- /dev/null
+++ b/bloclink/apps/pna/features/report.feature
@@ -0,0 +1,29 @@
+Feature: A building can generate and download report
+
+  Scenario Outline: User can generate report
+      Given I have the building <buildingId>
+      When I click generate button in Dashboard
+      Then report should <result>
+
+      Examples: Building has invalid inputs
+        | buildingId | result |
+        | 54321 | fail |
+        | 152699 | fail |
+
+      Examples: Building has valid inputs
+        | buildingId | result |
+        | 181794 | succeed |
+
+  Scenario Outline: User can download report
+      Given I have the building <buildingId>
+      When I click download button in Dashboard
+      Then report should <result>
+
+      Examples: Building has invalid inputs
+        | buildingId | fail |
+        | 181794 | fail |
+
+      Examples: Building has valid inputs
+        | buildingId | result |
+        | 54321 | succeed |
+        | 152699 | succeed |
diff --git a/bloclink/apps/pna/features/steps/downloadReport.py b/bloclink/apps/pna/features/steps/downloadReport.py
deleted file mode 100644
index 82972c6..0000000
--- a/bloclink/apps/pna/features/steps/downloadReport.py
+++ /dev/null
@@ -1,28 +0,0 @@
-from behave import *
-import requests
-import json
-
-
-@when('I click download button in Dashboard')
-def step_impl(context):
-    response = requests.get(url=context.basePath+context.buildingId+context.endpoints['downloadReport'])
-    context.code = str(response.status_code)
-    try:
-        response_obj = json.loads(response.text)
-        context.success = str(response_obj['success'])
-        context.fieldnames = response_obj.keys()
-    except:
-        context.success = "False"
-        context.fieldnames = []
-
-@then('report download should {result}')
-def step_impl(context, result):
-    if result == 'succeed':
-        assert context.code == "200"
-        assert context.success == "True"
-        assert context.fieldnames != []
-
-    if result == 'fail':
-        assert context.success == "False"
-        assert context.fieldnames == []
-
diff --git a/bloclink/apps/pna/features/steps/loadQuestionnaire.py b/bloclink/apps/pna/features/steps/questionnaire.py
similarity index 50%
rename from bloclink/apps/pna/features/steps/loadQuestionnaire.py
rename to bloclink/apps/pna/features/steps/questionnaire.py
index b3513b1..82d4169 100644
--- a/bloclink/apps/pna/features/steps/loadQuestionnaire.py
+++ b/bloclink/apps/pna/features/steps/questionnaire.py
@@ -19,7 +19,7 @@ def step_impl(context):
         context.submitted = "False"
         context.calculated = "False"
 
-@then('Result page should contain {button} button')
+@then('load result page should contain {button} button')
 def step_impl(context, button):
     assert context.code == "200"
 
@@ -34,3 +34,31 @@ def step_impl(context, button):
     if button == 'download':
         assert context.submitted == "True"
         assert context.calculated == "True"
+
+@when('I click submit button in Dashboard')
+def step_impl(context):
+    # Fill out building ID
+    buildingInfo = context.inputs['buildingInfo']
+    buildingInfo['building_id'] = context.buildingId
+    context.inputs['buildingInfo'] = buildingInfo
+    response = requests.put(url=context.basePath+context.buildingId+context.endpoints['submitQuestionnaire'], json=context.inputs)
+    context.code = str(response.status_code)
+    try:
+        response_obj = json.loads(response.text)
+        context.success = str(response_obj['success'])
+        context.fieldnames = response_obj.keys()
+    except:
+        context.success = "False"
+        context.fieldnames = []
+
+@then('submit result page should contain {button} button')
+def step_impl(context, button):
+    assert context.code == "200"
+
+    if button == 'submit':
+        assert context.success == "False"
+        assert context.fieldnames == []
+
+    if button == 'generate':
+        assert context.success == "True"
+        assert context.fieldnames != []
diff --git a/bloclink/apps/pna/features/steps/generateReport.py b/bloclink/apps/pna/features/steps/report.py
similarity index 58%
rename from bloclink/apps/pna/features/steps/generateReport.py
rename to bloclink/apps/pna/features/steps/report.py
index 4654ab1..e62e22a 100644
--- a/bloclink/apps/pna/features/steps/generateReport.py
+++ b/bloclink/apps/pna/features/steps/report.py
@@ -15,7 +15,20 @@ def step_impl(context):
         context.success = "False"
         context.fieldnames = []
 
-@then('report generation should {result}')
+@when('I click download button in Dashboard')
+def step_impl(context):
+    print(context.basePath+context.buildingId+context.endpoints['downloadReport'])
+    response = requests.get(url=context.basePath+context.buildingId+context.endpoints['downloadReport'])
+    context.code = str(response.status_code)
+    try:
+        response_obj = json.loads(response.text)
+        context.success = str(response_obj['success'])
+        context.fieldnames = response_obj.keys()
+    except:
+        context.success = "False"
+        context.fieldnames = []
+
+@then('report should {result}')
 def step_impl(context, result):
     if result == 'succeed':
         assert context.code == "200"
diff --git a/bloclink/apps/pna/features/steps/submitQuestionnaire.py b/bloclink/apps/pna/features/steps/submitQuestionnaire.py
deleted file mode 100644
index ac31ad2..0000000
--- a/bloclink/apps/pna/features/steps/submitQuestionnaire.py
+++ /dev/null
@@ -1,33 +0,0 @@
-from behave import *
-import requests
-import json
-
-
-@when('I click submit button in Dashboard')
-def step_impl(context):
-    # Fill out building ID
-    buildingInfo = context.inputs['buildingInfo']
-    buildingInfo['building_id'] = context.buildingId
-    context.inputs['buildingInfo'] = buildingInfo
-    response = requests.put(url=context.basePath+context.buildingId+context.endpoints['submitQuestionnaire'], json=context.inputs)
-    context.code = str(response.status_code)
-    try:
-        response_obj = json.loads(response.text)
-        context.success = str(response_obj['success'])
-        context.fieldnames = response_obj.keys()
-    except:
-        context.success = "False"
-        context.fieldnames = []
-
-@then('the page should contain {button} button')
-def step_impl(context, button):
-    assert context.code == "200"
-
-    if button == 'submit':
-        assert context.success == "False"
-        assert context.fieldnames == []
-
-    if button == 'generate':
-        assert context.success == "True"
-        assert context.fieldnames != []
-
diff --git a/bloclink/apps/pna/features/submitQuestionnaire.feature b/bloclink/apps/pna/features/submitQuestionnaire.feature
deleted file mode 100644
index 6a600fd..0000000
--- a/bloclink/apps/pna/features/submitQuestionnaire.feature
+++ /dev/null
@@ -1,16 +0,0 @@
-Feature: A building owner can submit questionnaire
-
-  @load.questionnaire.inputs
-  Scenario Outline: User can submit questionnaire
-      Given I have the building <buildingId>
-      When I click submit button in Dashboard
-      Then the page should contain <button> button
-
-      Examples: Building has invalid inputs
-        | buildingId | button |
-        | 54321 | submit |
-        | 152699 | submit |
-
-      Examples: Building has valid inputs
-        | buildingId | button |
-        | 181794 | generate |
-- 
GitLab


From 5114c6c07f2141b395c03976fecc491e783989db Mon Sep 17 00:00:00 2001
From: Aizizi Yigaimu <seniordevone@Aizizis-MBP.fios-router.home>
Date: Fri, 6 Mar 2020 15:59:43 -0500
Subject: [PATCH 4/4] Update feature description

---
 bloclink/apps/pna/features/questionnaire.feature | 2 +-
 bloclink/apps/pna/features/report.feature        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bloclink/apps/pna/features/questionnaire.feature b/bloclink/apps/pna/features/questionnaire.feature
index c77fb5b..b3db782 100644
--- a/bloclink/apps/pna/features/questionnaire.feature
+++ b/bloclink/apps/pna/features/questionnaire.feature
@@ -1,4 +1,4 @@
-Feature: A building owner can load and submit questionnaire
+Feature: User can load and submit questionnaire
 
   Scenario Outline: User can load questionnaire
       Given I have the building <buildingId>
diff --git a/bloclink/apps/pna/features/report.feature b/bloclink/apps/pna/features/report.feature
index 75d0b8a..8483515 100644
--- a/bloclink/apps/pna/features/report.feature
+++ b/bloclink/apps/pna/features/report.feature
@@ -1,4 +1,4 @@
-Feature: A building can generate and download report
+Feature: User can generate and download report
 
   Scenario Outline: User can generate report
       Given I have the building <buildingId>
-- 
GitLab