diff --git a/__tests__/e2e/tutorial.feature b/__tests__/e2e/tutorial.feature index 470168b1d..cb8eb03a0 100644 --- a/__tests__/e2e/tutorial.feature +++ b/__tests__/e2e/tutorial.feature @@ -5,6 +5,7 @@ Feature: Tutorial (?) Scenario: Verify the sandbox information is displayed # Enter steps here Given I am on the Wazimap Homepage + Then I wait until map is ready When I click on Tutorial Then "Introduction:" should be displayed And I click on Next diff --git a/__tests__/e2e/tutorial/Wazimap.js b/__tests__/e2e/tutorial/Wazimap.js index 5affb1b78..1c75b1b1e 100644 --- a/__tests__/e2e/tutorial/Wazimap.js +++ b/__tests__/e2e/tutorial/Wazimap.js @@ -1,9 +1,14 @@ import { When, Given, Then } from "cypress-cucumber-preprocessor/steps"; +import {waitUntilGeographyIsLoaded} from "../../gui/common_cy_functions/general"; Given('I am on the Wazimap Homepage', () => { cy.visit("/") }) +Then('I wait until map is ready', () => { + waitUntilGeographyIsLoaded('South Africa'); +}) + When("I click on {word}", (link) => { cy.findByText(link).click() }) diff --git a/__tests__/elements/tutorial.js b/__tests__/elements/tutorial.js index 6f2f1af17..53c71922d 100644 --- a/__tests__/elements/tutorial.js +++ b/__tests__/elements/tutorial.js @@ -1,5 +1,5 @@ import html from '../../src/index.html'; -import {Tutorial} from '../../src/js/elements/tutorial'; +import {Tutorial} from '../../src/js/elements/tutorial/tutorial'; import {Component} from "../../src/js/utils"; describe('Tutorials', () => { diff --git a/__tests__/gui/data_whitelist.feature b/__tests__/gui/data_whitelist.feature index f30b3db5b..35c906cfb 100644 --- a/__tests__/gui/data_whitelist.feature +++ b/__tests__/gui/data_whitelist.feature @@ -4,6 +4,8 @@ Feature: Data Whitelist Given I am on the Wazimap Homepage Then I wait until map is ready + Then I confirm that the view dropdown displays "Default" + # Choropleth default filter When I expand Data Mapper And I click on "Demographics" in Data Mapper @@ -27,6 +29,8 @@ Feature: Data Whitelist Given I am on the Wazimap Homepage Test View Then I wait until map is ready + Then I confirm that the view dropdown displays "test" + # Choropleth default filter When I expand Data Mapper And I click on "Demographics" in Data Mapper diff --git a/__tests__/gui/data_whitelist/data_whitelist.js b/__tests__/gui/data_whitelist/data_whitelist.js index 996aee155..638888a5a 100644 --- a/__tests__/gui/data_whitelist/data_whitelist.js +++ b/__tests__/gui/data_whitelist/data_whitelist.js @@ -70,10 +70,14 @@ Given('I am on the Wazimap Homepage Test View', () => { cy.visit("/?view=test"); }) +Then(/^I confirm that the view dropdown displays "([^"]*)"$/, function (word) { + cy.get('.current-view-container').should('contain.text', word) +}) + When(/^I confirm that available subindicators are "([^"]*)" in Data Mapper$/, function (options) { let optionsArr = options.split(','); cy.get('.data-mapper').find('.subIndicator-item').should('have.length', optionsArr.length) cy.get('.subIndicator-item').each(($div, index) => { expect($div.text()).equal(optionsArr[index]); }) -}); \ No newline at end of file +}) \ No newline at end of file diff --git a/src/401.html b/src/401.html index 7bc3155e4..90ea28bf7 100644 --- a/src/401.html +++ b/src/401.html @@ -1,5 +1,5 @@ - + @@ -15,7 +15,6 @@ - @@ -24,7 +23,7 @@
-
+

Protected Page

Incorrect password. Please try again.
@@ -42,6 +41,5 @@

Protected Page

- \ No newline at end of file diff --git a/src/about.html b/src/about.html index 79501c1f8..e4751b342 100644 --- a/src/about.html +++ b/src/about.html @@ -1,5 +1,5 @@ - + @@ -15,7 +15,6 @@ - @@ -32,7 +31,7 @@