Code Cleanup (#304)

* automated testing * chrome headless * remove test output * fix navigation on refresh * finish about us content * Delete tests_output/nightwatch-html-report directory Signed-off-by: usiiasirrush <[email protected]> * Update docker-image.yml Signed-off-by: usiiasirrush <[email protected]> * use reporter * coveratge report * Update docker-image.yml Signed-off-by: usiiasirrush <[email protected]> * fix screen display issue * Update and rename docker-image.yml to integration-testing.yml Signed-off-by: usiiasirrush <[email protected]> * fix builds * Update README.md Signed-off-by: usiiasirrush <[email protected]> * Update README.md Signed-off-by: usiiasirrush <[email protected]> * add developer tools * prune * Create CODE_OF_CONDUCT.md Signed-off-by: usiiasirrush <[email protected]> * Update docker-build.yml Signed-off-by: usiiasirrush <[email protected]> * cleanup * Create dependabot.yml Signed-off-by: usiiasirrush <[email protected]> * Update and rename GETTING-STARTED.md to GETTING_STARTED.md Signed-off-by: usiiasirrush <[email protected]> * Delete codeql.yml Signed-off-by: usiiasirrush <[email protected]> * Make Membership Zone page * fit text in card * Link unfinished pages to current site * add research and format * Center buttons on membership zone * Accessibility enhancements and icons * left align all cards * Fix Floating icons on Membership Zone (#290) * Staging (#288) (#294) * automated testing * chrome headless * remove test output * fix navigation on refresh * finish about us content * Delete tests_output/nightwatch-html-report directory * Update docker-image.yml * use reporter * coveratge report * Update docker-image.yml * fix screen display issue * Update and rename docker-image.yml to integration-testing.yml * fix builds * Update README.md * Update README.md * add developer tools * prune * Create CODE_OF_CONDUCT.md * Update docker-build.yml * cleanup * Create dependabot.yml * Update and rename GETTING-STARTED.md to GETTING_STARTED.md * Delete codeql.yml * Make Membership Zone page * fit text in card * Link unfinished pages to current site * add research and format * Center buttons on membership zone * Accessibility enhancements and icons * left align all cards --------- Signed-off-by: usiiasirrush <[email protected]> * Update staging.yml Signed-off-by: usiiasirrush <[email protected]> * Research Page (#299) * Code Cleanup * unsaved * SEO and Accessibility (#302) SEO meta tag and Accessibility for images by changing them to svg * Code Cleanup --------- Signed-off-by: usiiasirrush <[email protected]>
Neurodiversity-in-Business · Jul 20, 2023 · 3d88740 · 3d88740
1 parent 9d7edd1
commit 3d88740
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 33 deletions.
diff --git a/integration-testing/features/landing.feature b/integration-testing/features/landing.feature
@@ -2,5 +2,5 @@ Feature: Landing Page
     This feature lets a user see the landing page.
     Scenario: Basic increment scenario
         Given I go to "http://localhost:8080/"
-        Then I click on the Skip to Content link
+        When I click on the Skip to Content link
         Then the first header has focus
diff --git a/integration-testing/pages/home.po.js b/integration-testing/pages/home.po.js
@@ -1,6 +1,6 @@
 var HomePage = function () {
-  this.navigateToHome = () => {
-    browser.navigateTo("http://localhost:8080");
+  this.navigateTo = (urlString) => {
+    browser.navigateTo(urlString);
   };
 };
 

diff --git a/integration-testing/step_definitions/basic.steps.js b/integration-testing/step_definitions/basic.steps.js
@@ -1,5 +1,5 @@
 // Import the cucumber operators we need
-const { Before, Given, Then } = require("@cucumber/cucumber");
+const { Before, Given, Then, When } = require("@cucumber/cucumber");
 const { HomePage } = require("../pages/home.po");
 var chai = require("chai");
 var expect = chai.expect;
@@ -16,19 +16,21 @@ Before(function (scenario, callback) {
 });
 
 Given("I go to {string}", function (string) {
-  this.homepage.navigateToHome();
-  browser.pause(3000);
+  return this.homepage.navigateTo(string);
 });
-Then("I click on the Skip to Content link", function () {
+
+When('I click on the Skip to Content link', function () {
   browser.perform(function () {
     const actions = this.actions();
-    actions.click("#skipLink").pause(1000);
-    browser
-      .waitForElementPresent("#pageHeader")
-      .element("#pageHeader")
-      .expect.isSelected();
+    actions.click("#skipLink");
   });
 });
+
 Then("the first header has focus", async function () {
-  return browser.pause(1000).end();
+  browser.perform(function () {
+    return  this.waitForElementPresent("#pageHeader")
+      .element("#pageHeader")
+      .expect.isSelected();
+
+  });
 });
diff --git a/nightwatch.conf.js b/nightwatch.conf.js
@@ -109,20 +109,7 @@ module.exports = {
     chrome: {
       desiredCapabilities: {
         browserName: "chrome",
-        "goog:chromeOptions": {
-          // More info on Chromedriver: https://sites.google.com/a/chromium.org/chromedriver/
-          //
-          // w3c:false tells Chromedriver to run using the legacy JSONWire protocol (not required in Chrome 78)
-          w3c: true,
-          excludeSwitches: "[enable-logging]",
-          args: [
-            //'--no-sandbox',
-            "--ignore-certificate-errors",
-            "--allow-insecure-localhost",
-            "--headless",
-            "--log-level=1",
-          ],
-        },
+
       },
 
       webdriver: {

diff --git a/src/app/member-start/member-start.component.css b/src/app/member-start/member-start.component.css
@@ -60,7 +60,7 @@ button:hover {
   transform: scale(0.95);
 }
 
-.buttonBlurb {
+.button-blurb {
   justify-content: space-between;
   flex-direction: column;
   display: flex;

diff --git a/src/app/member-start/member-start.component.html b/src/app/member-start/member-start.component.html
@@ -10,7 +10,7 @@ <h1 id="pageHeader">Membership Zone</h1>
 
 <div class="container">
   <div class="row">
-    <div class="col buttonBlurb">
+    <div class="col button-blurb">
       <h3>
         <svg
           tabindex="-1"
@@ -58,7 +58,7 @@ <h3>
         </button>
       </p>
     </div>
-    <div class="col buttonBlurb">
+    <div class="col button-blurb">
       <h3>
         <svg
           tabindex="-1"
@@ -89,7 +89,7 @@ <h3>
         </button>
       </p>
     </div>
-    <div class="col buttonBlurb">
+    <div class="col button-blurb">
       <h3>
         <svg
           tabindex="-1"
@@ -192,7 +192,7 @@ <h2>Resources</h2>
 
   <div class="container" style="text-align: center">
     <div class="row">
-      <div class="col buttonBlurb">
+      <div class="col button-blurb">
         <h3>Resources and Learning Materials</h3>
         <p class="inner-text">
           Here we upload all learning materials that NiB and our member
@@ -205,7 +205,7 @@ <h3>Resources and Learning Materials</h3>
           </button>
         </p>
       </div>
-      <div class="col buttonBlurb">
+      <div class="col button-blurb">
         <h3>Events</h3>
         <p class="inner-text">
           Here you will find all information you need to learn about the events,