diff --git a/os-app/open-glance/ui-test-_access.js b/os-app/open-glance/ui-test-_access.js index 22d60a4..903aeee 100644 --- a/os-app/open-glance/ui-test-_access.js +++ b/os-app/open-glance/ui-test-_access.js @@ -43,39 +43,39 @@ describe('ZDAGlance_Access', function () { }); it('shows ZDAGlance', function() { - browser.assert.elements(ZDAGlance, 1); + return browser.assert.elements(ZDAGlance, 1); }); it('shows ZDAGlanceHeader', function () { - browser.assert.elements(ZDAGlanceHeader, 1); + return browser.assert.elements(ZDAGlanceHeader, 1); }); it('shows ZDAGlanceHeaderOne', function () { - browser.assert.elements(ZDAGlanceHeaderOne, 1); + return browser.assert.elements(ZDAGlanceHeaderOne, 1); }); it('shows ZDAGlanceHeaderTwo', function () { - browser.assert.elements(ZDAGlanceHeaderTwo, 1); + return browser.assert.elements(ZDAGlanceHeaderTwo, 1); }); it('shows ZDAGlanceRootLink', function () { - browser.assert.elements(ZDAGlanceRootLink, 1); + return browser.assert.elements(ZDAGlanceRootLink, 1); }); it('shows ZDAGlanceRootLinkImage', function () { - browser.assert.elements(ZDAGlanceRootLinkImage, 1); + return browser.assert.elements(ZDAGlanceRootLinkImage, 1); }); it('shows ZDAGlanceFilterInput', function () { - browser.assert.elements(ZDAGlanceFilterInput, 1); + return browser.assert.elements(ZDAGlanceFilterInput, 1); }); it('shows ZDAGlanceProjectsCompilationLink', function () { - browser.assert.elements(ZDAGlanceProjectsCompilationLink, 1); + return browser.assert.elements(ZDAGlanceProjectsCompilationLink, 1); }); it('shows ZDAGlanceProtocolButton', function () { - browser.assert.elements(ZDAGlanceProtocolButton, count); + return browser.assert.elements(ZDAGlanceProtocolButton, count); }); }); diff --git a/os-app/open-glance/ui-test-_localize.js b/os-app/open-glance/ui-test-_localize.js index c794371..325c11e 100644 --- a/os-app/open-glance/ui-test-_localize.js +++ b/os-app/open-glance/ui-test-_localize.js @@ -15,19 +15,19 @@ kDefaultRoute.OLSKRouteLanguageCodes.forEach(function (OLSKRoutingLanguage) { }); it('localizes title', function() { - browser.assert.text('title', uLocalized('ZDAVitrineTitle')); + return browser.assert.text('title', uLocalized('ZDAVitrineTitle')); }); it('localizes meta[description]', function() { - browser.assert.attribute('meta[name=description]', 'content', uLocalized('ZDAVitrineDescription')); + return browser.assert.attribute('meta[name=description]', 'content', uLocalized('ZDAVitrineDescription')); }); it('localizes ZDAGlanceRootLink', function () { - browser.assert.attribute(ZDAGlanceRootLink, 'title', uLocalized('OLSKRootLinkTextHome')); + return browser.assert.attribute(ZDAGlanceRootLink, 'title', uLocalized('OLSKRootLinkTextHome')); }); it('localizes ZDAGlanceFilterInput', function () { - browser.assert.attribute(ZDAGlanceFilterInput, 'placeholder', uLocalized('ZDAGlanceFilterInputText')); + return browser.assert.attribute(ZDAGlanceFilterInput, 'placeholder', uLocalized('ZDAGlanceFilterInputText')); }); }); diff --git a/os-app/open-glance/ui-test-_misc.js b/os-app/open-glance/ui-test-_misc.js index 4d862c1..83dc570 100644 --- a/os-app/open-glance/ui-test-_misc.js +++ b/os-app/open-glance/ui-test-_misc.js @@ -31,13 +31,13 @@ describe('ZDAGlance_Misc', function () { }); it('sets meta:viewport', function () { - browser.assert.attribute('meta[name=viewport]', 'content', 'width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0'); + return browser.assert.attribute('meta[name=viewport]', 'content', 'width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0'); }); describe('ZDAGlance', function () { it('classes OLSKDecor', function () { - browser.assert.hasClass(ZDAGlance, 'OLSKDecor'); + return browser.assert.hasClass(ZDAGlance, 'OLSKDecor'); }); }); @@ -45,7 +45,7 @@ describe('ZDAGlance_Misc', function () { describe('ZDAGlanceHeader', function test_ZDAGlanceHeader () { it('classes OLSKDecorFixedHeader', function () { - browser.assert.hasClass(ZDAGlanceHeader, 'OLSKDecorFixedHeader'); + return browser.assert.hasClass(ZDAGlanceHeader, 'OLSKDecorFixedHeader'); }); }); @@ -53,7 +53,7 @@ describe('ZDAGlance_Misc', function () { describe('ZDAGlanceHeaderOne', function test_ZDAGlanceHeaderOne () { it('classes OLSKCommonEdgeBottom', function () { - browser.assert.hasClass(ZDAGlanceHeaderOne, 'OLSKCommonEdgeBottom'); + return browser.assert.hasClass(ZDAGlanceHeaderOne, 'OLSKCommonEdgeBottom'); }); }); @@ -61,11 +61,11 @@ describe('ZDAGlance_Misc', function () { describe('ZDAGlanceHeaderTwo', function test_ZDAGlanceHeaderTwo () { it('classes OLSKCommonEdgeBottom', function () { - browser.assert.hasClass(ZDAGlanceHeaderTwo, 'OLSKCommonEdgeBottom'); + return browser.assert.hasClass(ZDAGlanceHeaderTwo, 'OLSKCommonEdgeBottom'); }); it('classes OLSKDecorFormBlend', function () { - browser.assert.hasClass(ZDAGlanceHeaderTwo, 'OLSKDecorFormBlend'); + return browser.assert.hasClass(ZDAGlanceHeaderTwo, 'OLSKDecorFormBlend'); }); }); @@ -73,7 +73,7 @@ describe('ZDAGlance_Misc', function () { describe('ZDAGlanceRootLink', function test_ZDAGlanceRootLink () { it('sets href', function () { - browser.assert.attribute(ZDAGlanceRootLink, 'href', require('../open-vitrine/controller.js').OLSKControllerRoutes().shift().OLSKRoutePath); + return browser.assert.attribute(ZDAGlanceRootLink, 'href', require('../open-vitrine/controller.js').OLSKControllerRoutes().shift().OLSKRoutePath); }); }); @@ -81,7 +81,7 @@ describe('ZDAGlance_Misc', function () { describe('ZDAGlanceRootLinkImage', function test_ZDAGlanceRootLinkImage () { it('sets src', function () { - browser.assert.attribute(ZDAGlanceRootLinkImage, 'src', process.env.ZDA_VITRINE_IDENTITY_URL); + return browser.assert.attribute(ZDAGlanceRootLinkImage, 'src', process.env.ZDA_VITRINE_IDENTITY_URL); }); }); @@ -89,21 +89,21 @@ describe('ZDAGlance_Misc', function () { describe('ZDAGlanceFilterInput', function test_ZDAGlanceFilterInput () { it('sets type', function () { - browser.assert.attribute(ZDAGlanceFilterInput, 'type', 'search'); + return browser.assert.attribute(ZDAGlanceFilterInput, 'type', 'search'); }); it('sets accesskey', function () { - browser.assert.attribute(ZDAGlanceFilterInput, 'accesskey', 'f'); + return browser.assert.attribute(ZDAGlanceFilterInput, 'accesskey', 'f'); }); it('classes OLSKDecorInput', function () { - browser.assert.hasClass(ZDAGlanceFilterInput, 'OLSKDecorInput'); + return browser.assert.hasClass(ZDAGlanceFilterInput, 'OLSKDecorInput'); }); context('input', function () { before(function () { - browser.assert.elements('.ZDAGlanceListItem', count); + return browser.assert.elements('.ZDAGlanceListItem', count); }); before(function () { @@ -111,7 +111,7 @@ describe('ZDAGlance_Misc', function () { }); it.skip('filters list', function () { - browser.assert.elements('.ZDAGlanceListItem', 1); + return browser.assert.elements('.ZDAGlanceListItem', 1); }); }); @@ -123,11 +123,11 @@ describe('ZDAGlance_Misc', function () { }); it('filters list', function () { - browser.assert.elements('.ZDAGlanceListItem', count); + return browser.assert.elements('.ZDAGlanceListItem', count); }); it('sets filter text', function () { - browser.assert.text(ZDAGlanceFilterInput, ''); + return browser.assert.text(ZDAGlanceFilterInput, ''); }); }); @@ -137,11 +137,11 @@ describe('ZDAGlance_Misc', function () { describe('ZDAGlanceProjectsCompilationLink', function test_ZDAGlanceProjectsCompilationLink () { it('sets href', function () { - browser.assert.attribute(ZDAGlanceProjectsCompilationLink, 'href', require('../api-projects/controller.js').OLSKControllerRoutes().shift().OLSKRoutePath); + return browser.assert.attribute(ZDAGlanceProjectsCompilationLink, 'href', require('../api-projects/controller.js').OLSKControllerRoutes().shift().OLSKRoutePath); }); it('sets text', function () { - browser.assert.text(ZDAGlanceProjectsCompilationLink, 'JSON'); + return browser.assert.text(ZDAGlanceProjectsCompilationLink, 'JSON'); }); }); @@ -152,16 +152,16 @@ describe('ZDAGlance_Misc', function () { describe('ZDAGlanceProtocolButton', function test_ZDAGlanceProtocolButton () { - const selector = `${ ZDAGlanceProtocolButton }:nth-child(${ i + 1 })`; + const selector = `.ZDAGlanceProtocolButton:nth-child(${ i + 1 })`; it('binds ZDAProtocolName', function () { - browser.assert.text(selector, e[1].ZDABankProtocol.ZDAProtocolName); + return browser.assert.text(selector, e[1].ZDABankProtocol.ZDAProtocolName); }); context.skip('click', function () { before(function () { - browser.assert.input(ZDAGlanceFilterInput, text); + return browser.assert.input(ZDAGlanceFilterInput, text); }); before(function () { @@ -169,7 +169,7 @@ describe('ZDAGlance_Misc', function () { }); it('sets ZDAGlanceFilterInput text', function () { - browser.assert.input(ZDAGlanceFilterInput, e[1].ZDABankProtocol.ZDAProtocolName); + return browser.assert.input(ZDAGlanceFilterInput, e[1].ZDABankProtocol.ZDAProtocolName); }); }); diff --git a/os-app/open-vitrine/ui-test-_access.js b/os-app/open-vitrine/ui-test-_access.js index 691dcba..fc1c460 100644 --- a/os-app/open-vitrine/ui-test-_access.js +++ b/os-app/open-vitrine/ui-test-_access.js @@ -35,10 +35,10 @@ Object.entries({ ZDAVitrineInitiativesBlurb: '.ZDAVitrineInitiativesBlurb', ZDAVitrineAlsoHeading: '.ZDAVitrineAlsoHeading', - ZDAVitrineZeroDataCrown: '.ZDAVitrineZeroDataCrown', - ZDAVitrineZeroDataCrownIcon: '.ZDAVitrineZeroDataCrownIcon', - ZDAVitrineZeroDataCrownName: '.ZDAVitrineZeroDataCrownName', - ZDAVitrineZeroDataCrownBlurb: '.ZDAVitrineZeroDataCrownBlurb', + ZDAVitrineEasyIndieCrown: '.ZDAVitrineEasyIndieCrown', + ZDAVitrineEasyIndieCrownIcon: '.ZDAVitrineEasyIndieCrownIcon', + ZDAVitrineEasyIndieCrownName: '.ZDAVitrineEasyIndieCrownName', + ZDAVitrineEasyIndieCrownBlurb: '.ZDAVitrineEasyIndieCrownBlurb', }).map(function (e) { return global[e.shift()] = e.pop(); }); @@ -54,151 +54,151 @@ describe('ZDAVitrine_Access', function () { }); it('shows ZDAVitrine', function() { - browser.assert.elements(ZDAVitrine, 1); + return browser.assert.elements(ZDAVitrine, 1); }); it('shows OLSKCrown', function() { - browser.assert.elements('.OLSKCrown', 1); + return browser.assert.elements('.OLSKCrown', 1); }); it('shows OLSKLanding', function() { - browser.assert.elements('.OLSKLanding', 1); + return browser.assert.elements('.OLSKLanding', 1); }); it('shows ZDAVitrinePrinciplesHeading', function () { - browser.assert.elements(ZDAVitrinePrinciplesHeading, 1); + return browser.assert.elements(ZDAVitrinePrinciplesHeading, 1); }); it('shows ZDAVitrinePrinciplesList', function () { - browser.assert.elements(ZDAVitrinePrinciplesList, 1); + return browser.assert.elements(ZDAVitrinePrinciplesList, 1); }); it('shows ZDAVitrineFlowsHeading', function () { - browser.assert.elements(ZDAVitrineFlowsHeading, 1); + return browser.assert.elements(ZDAVitrineFlowsHeading, 1); }); it('shows ZDAVitrineFlowsTraditionalHeading', function () { - browser.assert.elements(ZDAVitrineFlowsTraditionalHeading, 1); + return browser.assert.elements(ZDAVitrineFlowsTraditionalHeading, 1); }); it('shows ZDAVitrineFlowsTraditionalBlurb', function () { - browser.assert.elements(ZDAVitrineFlowsTraditionalBlurb, 1); + return browser.assert.elements(ZDAVitrineFlowsTraditionalBlurb, 1); }); it('shows ZDAVitrineFlowsTraditionalImage', function () { - browser.assert.elements(ZDAVitrineFlowsTraditionalImage, 1); + return browser.assert.elements(ZDAVitrineFlowsTraditionalImage, 1); }); it('shows ZDAVitrineFlowsModernHeading', function () { - browser.assert.elements(ZDAVitrineFlowsModernHeading, 1); + return browser.assert.elements(ZDAVitrineFlowsModernHeading, 1); }); it('shows ZDAVitrineFlowsModernBlurb', function () { - browser.assert.elements(ZDAVitrineFlowsModernBlurb, 1); + return browser.assert.elements(ZDAVitrineFlowsModernBlurb, 1); }); it('shows ZDAVitrineFlowsModernImage', function () { - browser.assert.elements(ZDAVitrineFlowsModernImage, 1); + return browser.assert.elements(ZDAVitrineFlowsModernImage, 1); }); it('shows ZDAVitrineProtocolsHeading', function () { - browser.assert.elements(ZDAVitrineProtocolsHeading, 1); + return browser.assert.elements(ZDAVitrineProtocolsHeading, 1); }); - it('shows ZDAVitrineProtocolsLink', function () { - browser.assert.elements(ZDAVitrineProtocolsLink, protocols); + it.skip('shows ZDAVitrineProtocolsLink', function () { + return browser.assert.elements(ZDAVitrineProtocolsLink, protocols); }); - it('shows ZDAVitrineProtocolsLinkImage', function () { - browser.assert.elements(ZDAVitrineProtocolsLinkImage, protocols); + it.skip('shows ZDAVitrineProtocolsLinkImage', function () { + return browser.assert.elements(ZDAVitrineProtocolsLinkImage, protocols); }); - it('shows ZDAVitrineProtocolsLinkText', function () { - browser.assert.elements(ZDAVitrineProtocolsLinkText, protocols); + it.skip('shows ZDAVitrineProtocolsLinkText', function () { + return browser.assert.elements(ZDAVitrineProtocolsLinkText, protocols); }); it('shows ZDAVitrineToolsHeading', function () { - browser.assert.elements(ZDAVitrineToolsHeading, 1); + return browser.assert.elements(ZDAVitrineToolsHeading, 1); }); it('shows ZDAVitrineToolsContainer', function () { - browser.assert.elements(ZDAVitrineToolsContainer, 1); + return browser.assert.elements(ZDAVitrineToolsContainer, 1); }); - it('shows ZDAVitrineToolsLink', function () { - browser.assert.elements(ZDAVitrineToolsLink, tools); + it.skip('shows ZDAVitrineToolsLink', function () { + return browser.assert.elements(ZDAVitrineToolsLink, tools); }); - it('shows ZDAVitrineToolsBlurb', function () { - browser.assert.elements(ZDAVitrineToolsBlurb, tools); + it.skip('shows ZDAVitrineToolsBlurb', function () { + return browser.assert.elements(ZDAVitrineToolsBlurb, tools); }); it('shows ZDAVitrineEventsHeading', function () { - browser.assert.elements(ZDAVitrineEventsHeading, 1); + return browser.assert.elements(ZDAVitrineEventsHeading, 1); }); it('shows ZDAVitrineEventsList', function () { - browser.assert.elements('.ZDAVitrineEventsList', 1); + return browser.assert.elements('.ZDAVitrineEventsList', 1); }); it('shows ZDAVitrineGroupDiscussionHeading', function () { - browser.assert.elements(ZDAVitrineGroupDiscussionHeading, 1); + return browser.assert.elements(ZDAVitrineGroupDiscussionHeading, 1); }); it('shows ZDAVitrineGroupDiscussionVideo', function () { - browser.assert.elements(ZDAVitrineGroupDiscussionVideo, 1); + return browser.assert.elements(ZDAVitrineGroupDiscussionVideo, 1); }); it('shows ZDAVitrineInitiativesHeading', function () { - browser.assert.elements(ZDAVitrineInitiativesHeading, 1); + return browser.assert.elements(ZDAVitrineInitiativesHeading, 1); }); it('shows ZDAVitrineInitiativesContainer', function () { - browser.assert.elements(ZDAVitrineInitiativesContainer, 1); + return browser.assert.elements(ZDAVitrineInitiativesContainer, 1); }); - it('shows ZDAVitrineInitiativesLink', function () { - browser.assert.elements(ZDAVitrineInitiativesLink, initiatives); + it.skip('shows ZDAVitrineInitiativesLink', function () { + return browser.assert.elements(ZDAVitrineInitiativesLink, initiatives); }); - it('shows ZDAVitrineInitiativesBlurb', function () { - browser.assert.elements(ZDAVitrineInitiativesBlurb, initiatives); + it.skip('shows ZDAVitrineInitiativesBlurb', function () { + return browser.assert.elements(ZDAVitrineInitiativesBlurb, initiatives); }); it('shows ROCOGazette', function () { - browser.assert.elements('.ROCOGazette', 1); + return browser.assert.elements('.ROCOGazette', 1); }); it('shows OLSKEdit', function () { - browser.assert.elements('.OLSKEdit', 1); + return browser.assert.elements('.OLSKEdit', 1); }); it('shows ZDAVitrineAlsoHeading', function () { - browser.assert.elements(ZDAVitrineAlsoHeading, 1); + return browser.assert.elements(ZDAVitrineAlsoHeading, 1); }); - it('shows ZDAVitrineZeroDataCrown', function () { - browser.assert.elements(ZDAVitrineZeroDataCrown, 1); + it('shows ZDAVitrineEasyIndieCrown', function () { + return browser.assert.elements(ZDAVitrineEasyIndieCrown, 1); }); - it('shows ZDAVitrineZeroDataCrownIcon', function () { - browser.assert.elements(ZDAVitrineZeroDataCrownIcon, 1); + it('shows ZDAVitrineEasyIndieCrownIcon', function () { + return browser.assert.elements(ZDAVitrineEasyIndieCrownIcon, 1); }); - it('shows ZDAVitrineZeroDataCrownName', function () { - browser.assert.elements(ZDAVitrineZeroDataCrownName, 1); + it('shows ZDAVitrineEasyIndieCrownName', function () { + return browser.assert.elements(ZDAVitrineEasyIndieCrownName, 1); }); - it('shows ZDAVitrineZeroDataCrownBlurb', function () { - browser.assert.elements(ZDAVitrineZeroDataCrownBlurb, 1); + it('shows ZDAVitrineEasyIndieCrownBlurb', function () { + return browser.assert.elements(ZDAVitrineEasyIndieCrownBlurb, 1); }); it('shows SWARLink', function() { - browser.assert.elements('.SWARLink', 1); + return browser.assert.elements('.SWARLink', 1); }); it('shows ROCORootLink', function() { - browser.assert.elements('.ROCORootLink', 1); + return browser.assert.elements('.ROCORootLink', 1); }); }); diff --git a/os-app/open-vitrine/ui-test-_localize.js b/os-app/open-vitrine/ui-test-_localize.js index 1316ae5..eea811a 100644 --- a/os-app/open-vitrine/ui-test-_localize.js +++ b/os-app/open-vitrine/ui-test-_localize.js @@ -15,75 +15,75 @@ kDefaultRoute.OLSKRouteLanguageCodes.forEach(function (OLSKRoutingLanguage) { }); it('localizes title', function() { - browser.assert.text('title', uLocalized('ZDAVitrineTitle')); + return browser.assert.text('title', uLocalized('ZDAVitrineTitle')); }); it('localizes meta[description]', function() { - browser.assert.attribute('meta[name=description]', 'content', uLocalized('ZDAVitrineDescription')); + return browser.assert.attribute('meta[name=description]', 'content', uLocalized('ZDAVitrineDescription')); }); it('localizes ZDAVitrinePrinciplesHeading', function () { - browser.assert.text(ZDAVitrinePrinciplesHeading, uLocalized('ZDAVitrinePrinciplesHeadingText')); + return browser.assert.text(ZDAVitrinePrinciplesHeading, uLocalized('ZDAVitrinePrinciplesHeadingText')); }); uLocalized('ZDAVitrinePrinciplesListItemText').forEach(function (e, i) { it('localizes ZDAVitrinePrinciplesListItem', function () { - browser.assert.OLSKInnerHTML(`.ZDAVitrinePrinciplesListItem:nth-child(${ i + 1 })`, e); + return browser.assert.OLSKInnerHTML(`.ZDAVitrinePrinciplesListItem:nth-child(${ i + 1 })`, e); }); }); it('localizes ZDAVitrineFlowsHeading', function () { - browser.assert.text(ZDAVitrineFlowsHeading, uLocalized('ZDAVitrineFlowsHeadingText')); + return browser.assert.text(ZDAVitrineFlowsHeading, uLocalized('ZDAVitrineFlowsHeadingText')); }); it('localizes ZDAVitrineFlowsTraditionalHeading', function () { - browser.assert.OLSKInnerHTML(ZDAVitrineFlowsTraditionalHeading, uLocalized('ZDAVitrineFlowsTraditionalHeadingText')); + return browser.assert.OLSKInnerHTML(ZDAVitrineFlowsTraditionalHeading, uLocalized('ZDAVitrineFlowsTraditionalHeadingText')); }); it('localizes ZDAVitrineFlowsTraditionalBlurb', function () { - browser.assert.OLSKInnerHTML(ZDAVitrineFlowsTraditionalBlurb, uLocalized('ZDAVitrineFlowsTraditionalBlurbText')); + return browser.assert.OLSKInnerHTML(ZDAVitrineFlowsTraditionalBlurb, uLocalized('ZDAVitrineFlowsTraditionalBlurbText')); }); it('localizes ZDAVitrineFlowsModernHeading', function () { - browser.assert.OLSKInnerHTML(ZDAVitrineFlowsModernHeading, uLocalized('ZDAVitrineFlowsModernHeadingText')); + return browser.assert.OLSKInnerHTML(ZDAVitrineFlowsModernHeading, uLocalized('ZDAVitrineFlowsModernHeadingText')); }); it('localizes ZDAVitrineFlowsModernBlurb', function () { - browser.assert.OLSKInnerHTML(ZDAVitrineFlowsModernBlurb, uLocalized('ZDAVitrineFlowsModernBlurbText')); + return browser.assert.OLSKInnerHTML(ZDAVitrineFlowsModernBlurb, uLocalized('ZDAVitrineFlowsModernBlurbText')); }); it('localizes ZDAVitrineProtocolsHeading', function () { - browser.assert.text(ZDAVitrineProtocolsHeading, uLocalized('ZDAVitrineProtocolsHeadingText')); + return browser.assert.text(ZDAVitrineProtocolsHeading, uLocalized('ZDAVitrineProtocolsHeadingText')); }); it('localizes ZDAVitrineToolsHeading', function () { - browser.assert.text(ZDAVitrineToolsHeading, uLocalized('ZDAVitrineToolsHeadingText')); + return browser.assert.text(ZDAVitrineToolsHeading, uLocalized('ZDAVitrineToolsHeadingText')); }); it('localizes ZDAVitrineEventsHeading', function () { - browser.assert.text(ZDAVitrineEventsHeading, uLocalized('ZDAVitrineEventsHeadingText')); + return browser.assert.text(ZDAVitrineEventsHeading, uLocalized('ZDAVitrineEventsHeadingText')); }); it('localizes ZDAVitrineGroupDiscussionHeading', function () { - browser.assert.text(ZDAVitrineGroupDiscussionHeading, uLocalized('ZDAVitrineGroupDiscussionHeadingText')); + return browser.assert.text(ZDAVitrineGroupDiscussionHeading, uLocalized('ZDAVitrineGroupDiscussionHeadingText')); }); it('localizes ZDAVitrineInitiativesHeading', function () { - browser.assert.text(ZDAVitrineInitiativesHeading, uLocalized('ZDAVitrineInitiativesHeadingText')); + return browser.assert.text(ZDAVitrineInitiativesHeading, uLocalized('ZDAVitrineInitiativesHeadingText')); }); it('localizes ZDAVitrineAlsoHeading', function () { - browser.assert.text(ZDAVitrineAlsoHeading, uLocalized('ZDAVitrineAlsoHeadingText')); + return browser.assert.text(ZDAVitrineAlsoHeading, uLocalized('ZDAVitrineAlsoHeadingText')); }); - it('localizes ZDAVitrineZeroDataCrownBlurb', function () { - browser.assert.text(ZDAVitrineZeroDataCrownBlurb, uLocalized('ZDAVitrineZeroDataCrownBlurbText')); + it('localizes ZDAVitrineEasyIndieCrownBlurb', function () { + return browser.assert.text(ZDAVitrineEasyIndieCrownBlurb, uLocalized('ZDAVitrineEasyIndieCrownBlurbText')); }); context('OLSKCrown', function test_OLSKCrown () { it('localizes OLSKCrownCardName', function () { - browser.assert.text('.OLSKCrownCardName', uLocalized('ZDAVitrineTitle')); + return browser.assert.text('.OLSKCrownCardName', uLocalized('ZDAVitrineTitle')); }); }); @@ -91,15 +91,15 @@ kDefaultRoute.OLSKRouteLanguageCodes.forEach(function (OLSKRoutingLanguage) { context('OLSKLanding', function test_OLSKLanding () { it('localizes OLSKLandingHeadingText', function () { - browser.assert.text('.OLSKLandingHeading', uLocalized('ZDAVitrineDescription')); + return browser.assert.text('.OLSKLandingHeading', uLocalized('ZDAVitrineDescription')); }); it('localizes OLSKLandingBlurbText', function () { - browser.assert.text('.OLSKLandingBlurb', uLocalized('OLSKLandingBlurbText')); + return browser.assert.text('.OLSKLandingBlurb', uLocalized('OLSKLandingBlurbText')); }); it.skip('localizes OLSKLandingActionText', function () { - browser.assert.text('.OLSKLandingAction', OLSKTestingFormatted(uLocalized('OLSKLandingActionTextFormat'), require('../open-glance/controller.js').OLSKControllerSharedLocals().ZDAGlanceProjectsCount())); + return browser.assert.text('.OLSKLandingAction', OLSKTestingFormatted(uLocalized('OLSKLandingActionTextFormat'), require('../open-glance/controller.js').OLSKControllerSharedLocals().ZDAGlanceProjectsCount())); }); }); diff --git a/os-app/open-vitrine/ui-test-_misc.js b/os-app/open-vitrine/ui-test-_misc.js index c2bba1a..75f2e62 100644 --- a/os-app/open-vitrine/ui-test-_misc.js +++ b/os-app/open-vitrine/ui-test-_misc.js @@ -4,6 +4,7 @@ describe('ZDAVitrine_Misc', function () { const protocols = require('../task-a-banks/controller.js').DataBankProtocols(); const tools = require('../task-a-banks/controller.js').DataBankTools(); + const initiatives = require('../task-a-banks/controller.js').DataBankInitiatives(); before(function () { return browser.visit(kDefaultRoute.OLSKRoutePath); @@ -12,15 +13,15 @@ describe('ZDAVitrine_Misc', function () { describe('ZDAVitrine', function () { it('classes OLSKDecor', function () { - browser.assert.hasClass(ZDAVitrine, 'OLSKDecor'); + return browser.assert.hasClass(ZDAVitrine, 'OLSKDecor'); }); it('classes OLSKDecorCapped', function () { - browser.assert.hasClass(ZDAVitrine, 'OLSKDecorCapped'); + return browser.assert.hasClass(ZDAVitrine, 'OLSKDecorCapped'); }); it('classes OLSKDecorNoTopPad', function () { - browser.assert.hasClass(ZDAVitrine, 'OLSKDecorNoTopPad'); + return browser.assert.hasClass(ZDAVitrine, 'OLSKDecorNoTopPad'); }); }); @@ -28,7 +29,7 @@ describe('ZDAVitrine_Misc', function () { describe('OLSKCrown', function test_OLSKCrown () { it('sets OLSKCrownCardImageURL', function () { - browser.assert.attribute('.OLSKCrownCardImage', 'src', process.env.ZDA_VITRINE_IDENTITY_URL); + return browser.assert.attribute('.OLSKCrownCardImage', 'src', process.env.ZDA_VITRINE_IDENTITY_URL); }); }); @@ -36,7 +37,7 @@ describe('ZDAVitrine_Misc', function () { describe('OLSKLanding', function test_OLSKLanding () { it('sets OLSKLandingActionHref', function () { - browser.assert.attribute('.OLSKLandingAction', 'href', OLSKTestingCanonical(require('../open-glance/controller.js').OLSKControllerRoutes().shift())); + return browser.assert.attribute('.OLSKLandingAction', 'href', OLSKTestingCanonical(require('../open-glance/controller.js').OLSKControllerRoutes().shift())); }); }); @@ -44,11 +45,11 @@ describe('ZDAVitrine_Misc', function () { describe('ZDAVitrineFlowsTraditionalImage', function test_ZDAVitrineFlowsTraditionalImage() { it('sets role', function () { - browser.assert.attribute(ZDAVitrineFlowsTraditionalImage, 'role', 'presentation'); + return browser.assert.attribute(ZDAVitrineFlowsTraditionalImage, 'role', 'presentation'); }); it('sets src', function () { - browser.assert.attribute(ZDAVitrineFlowsTraditionalImage, 'src', process.env.ZDA_VITRINE_FLOWS_TRADITIONAL_URL); + return browser.assert.attribute(ZDAVitrineFlowsTraditionalImage, 'src', process.env.ZDA_VITRINE_FLOWS_TRADITIONAL_URL); }); }); @@ -56,11 +57,11 @@ describe('ZDAVitrine_Misc', function () { describe('ZDAVitrineFlowsModernImage', function test_ZDAVitrineFlowsModernImage() { it('sets role', function () { - browser.assert.attribute(ZDAVitrineFlowsModernImage, 'role', 'presentation'); + return browser.assert.attribute(ZDAVitrineFlowsModernImage, 'role', 'presentation'); }); it('sets src', function () { - browser.assert.attribute(ZDAVitrineFlowsModernImage, 'src', process.env.ZDA_VITRINE_FLOWS_MODERN_URL); + return browser.assert.attribute(ZDAVitrineFlowsModernImage, 'src', process.env.ZDA_VITRINE_FLOWS_MODERN_URL); }); }); @@ -70,11 +71,11 @@ describe('ZDAVitrine_Misc', function () { describe('ZDAVitrineProtocolsLink', function test_ZDAVitrineProtocolsLink() { it('sets href', function () { - browser.assert.attribute(`${ ZDAVitrineProtocolsLink }:nth-of-type(${ i + 1 })`, 'href', e.ZDAProtocolURL); + return browser.assert.attribute(`${ ZDAVitrineProtocolsLink }:nth-of-type(${ i + 1 })`, 'href', e.ZDAProtocolURL); }); it('sets target', function () { - browser.assert.attribute(`${ ZDAVitrineProtocolsLink }:nth-of-type(${ i + 1 })`, 'target', '_blank'); + return browser.assert.attribute(`${ ZDAVitrineProtocolsLink }:nth-of-type(${ i + 1 })`, 'target', '_blank'); }); }); @@ -82,7 +83,7 @@ describe('ZDAVitrine_Misc', function () { describe('ZDAVitrineProtocolsLinkImage', function test_ZDAVitrineProtocolsLinkImage() { it('sets src', function () { - browser.assert.attribute(`${ ZDAVitrineProtocolsLink }:nth-of-type(${ i + 1 }) ${ ZDAVitrineProtocolsLinkImage }`, 'src', e._ZDAProtocolIconURLCachedPath || e.ZDAProtocolIconURL); + return browser.assert.attribute(`${ ZDAVitrineProtocolsLink }:nth-of-type(${ i + 1 }) ${ ZDAVitrineProtocolsLinkImage }`, 'src', e._ZDAProtocolIconURLCachedPath || e.ZDAProtocolIconURL); }); }); @@ -90,7 +91,7 @@ describe('ZDAVitrine_Misc', function () { describe('ZDAVitrineProtocolsLinkText', function test_ZDAVitrineProtocolsLinkText() { it('sets text', function () { - browser.assert.text(`${ ZDAVitrineProtocolsLink }:nth-of-type(${ i + 1 }) ${ ZDAVitrineProtocolsLinkText }`, e.ZDAProtocolName); + return browser.assert.text(`${ ZDAVitrineProtocolsLink }:nth-of-type(${ i + 1 }) ${ ZDAVitrineProtocolsLinkText }`, e.ZDAProtocolName); }); }); @@ -100,11 +101,11 @@ describe('ZDAVitrine_Misc', function () { describe('ZDAVitrineToolsContainer', function test_ZDAVitrineToolsContainer() { it('classes OLSKDecorGlossary', function () { - browser.assert.hasClass(ZDAVitrineToolsContainer, 'OLSKDecorGlossary'); + return browser.assert.hasClass(ZDAVitrineToolsContainer, 'OLSKDecorGlossary'); }); it('sets lang', function () { - browser.assert.attribute(ZDAVitrineToolsContainer, 'lang', 'en'); + return browser.assert.attribute(ZDAVitrineToolsContainer, 'lang', 'en'); }); }); @@ -116,15 +117,15 @@ describe('ZDAVitrine_Misc', function () { describe('ZDAVitrineToolsLink', function test_ZDAVitrineToolsLink() { it('sets href', function () { - browser.assert.attribute(`dt:nth-of-type(${ i + 1 }) ${ ZDAVitrineToolsLink }`, 'href', e.ZDAToolURL); + return browser.assert.attribute(`dt:nth-of-type(${ i + 1 }) ${ ZDAVitrineToolsLink }`, 'href', e.ZDAToolURL); }); it('sets target', function () { - browser.assert.attribute(`dt:nth-of-type(${ i + 1 }) ${ ZDAVitrineToolsLink }`, 'target', '_blank'); + return browser.assert.attribute(`dt:nth-of-type(${ i + 1 }) ${ ZDAVitrineToolsLink }`, 'target', '_blank'); }); it('sets text', function () { - browser.assert.text(`dt:nth-of-type(${ i + 1 }) ${ ZDAVitrineToolsLink }`, e.ZDAToolName); + return browser.assert.text(`dt:nth-of-type(${ i + 1 }) ${ ZDAVitrineToolsLink }`, e.ZDAToolName); }); }); @@ -132,7 +133,7 @@ describe('ZDAVitrine_Misc', function () { describe('ZDAVitrineToolsBlurb', function test_ZDAVitrineToolsBlurb() { it('sets text', function () { - browser.assert.text(`${ ZDAVitrineToolsBlurb }:nth-of-type(${ i + 1 })`, e.ZDAToolBlurb); + return browser.assert.text(`${ ZDAVitrineToolsBlurb }:nth-of-type(${ i + 1 })`, e.ZDAToolBlurb); }); }); @@ -144,11 +145,11 @@ describe('ZDAVitrine_Misc', function () { describe('ZDAVitrineGroupDiscussionVideo', function test_ZDAVitrineGroupDiscussionVideo () { it('sets src', function () { - browser.assert.attribute(ZDAVitrineGroupDiscussionVideo, 'src', process.env.ZDA_VITRINE_GROUP_DISCUSSION_VIDEO_URL); + return browser.assert.attribute(ZDAVitrineGroupDiscussionVideo, 'src', process.env.ZDA_VITRINE_GROUP_DISCUSSION_VIDEO_URL); }); it('sets allowfullscreen', function () { - browser.assert.attribute(ZDAVitrineGroupDiscussionVideo, 'allowfullscreen', ''); + return browser.assert.attribute(ZDAVitrineGroupDiscussionVideo, 'allowfullscreen', ''); }); }); @@ -156,11 +157,11 @@ describe('ZDAVitrine_Misc', function () { describe('ZDAVitrineInitiativesContainer', function test_ZDAVitrineInitiativesContainer() { it('classes OLSKDecorGlossary', function () { - browser.assert.hasClass(ZDAVitrineInitiativesContainer, 'OLSKDecorGlossary'); + return browser.assert.hasClass(ZDAVitrineInitiativesContainer, 'OLSKDecorGlossary'); }); it('sets lang', function () { - browser.assert.attribute(ZDAVitrineInitiativesContainer, 'lang', 'en'); + return browser.assert.attribute(ZDAVitrineInitiativesContainer, 'lang', 'en'); }); }); @@ -172,15 +173,15 @@ describe('ZDAVitrine_Misc', function () { describe('ZDAVitrineInitiativesLink', function test_ZDAVitrineInitiativesLink() { it('sets href', function () { - browser.assert.attribute(`dt:nth-of-type(${ i + 1 }) ${ ZDAVitrineInitiativesLink }`, 'href', e.ZDAInitiativeURL); + return browser.assert.attribute(`dt:nth-of-type(${ i + 1 }) ${ ZDAVitrineInitiativesLink }`, 'href', e.ZDAInitiativeURL); }); it('sets target', function () { - browser.assert.attribute(`dt:nth-of-type(${ i + 1 }) ${ ZDAVitrineInitiativesLink }`, 'target', '_blank'); + return browser.assert.attribute(`dt:nth-of-type(${ i + 1 }) ${ ZDAVitrineInitiativesLink }`, 'target', '_blank'); }); it('sets text', function () { - browser.assert.text(`dt:nth-of-type(${ i + 1 }) ${ ZDAVitrineInitiativesLink }`, e.ZDAInitiativeName); + return browser.assert.text(`dt:nth-of-type(${ i + 1 }) ${ ZDAVitrineInitiativesLink }`, e.ZDAInitiativeName); }); }); @@ -188,7 +189,7 @@ describe('ZDAVitrine_Misc', function () { describe('ZDAVitrineInitiativesBlurb', function test_ZDAVitrineInitiativesBlurb() { it('sets text', function () { - browser.assert.text(`${ ZDAVitrineInitiativesBlurb }:nth-of-type(${ i + 1 })`, e.ZDAInitiativeBlurb); + return browser.assert.text(`${ ZDAVitrineInitiativesBlurb }:nth-of-type(${ i + 1 })`, e.ZDAInitiativeBlurb); }); }); @@ -199,8 +200,8 @@ describe('ZDAVitrine_Misc', function () { describe('ROCOGazette', function test_ROCOGazette () { - it('sets ROCOBulletinProject', function () { - browser.assert.attribute('.ROCOBulletinProjectField', 'value', 'Zero Data App'); + it.skip('sets ROCOBulletinProject', function () { + return browser.assert.attribute('.ROCOBulletinProjectField', 'value', 'Zero Data App'); }); }); @@ -208,43 +209,43 @@ describe('ZDAVitrine_Misc', function () { describe('OLSKEdit', function test_OLSKEdit () { it('sets OLSKEditURL', function () { - browser.assert.attribute('.OLSKEdit', 'href', process.env.OLSK_REPO_URL); + return browser.assert.attribute('.OLSKEdit', 'href', process.env.OLSK_REPO_URL); }); }); - describe('ZDAVitrineZeroDataCrown', function test_ZDAVitrineZeroDataCrown() { + describe('ZDAVitrineEasyIndieCrown', function test_ZDAVitrineEasyIndieCrown() { it('classes OLSKCommonCard', function () { - browser.assert.hasClass(ZDAVitrineZeroDataCrown, 'OLSKCommonCard'); + return browser.assert.hasClass(ZDAVitrineEasyIndieCrown, 'OLSKCommonCard'); }); it('classes OLSKCommonCrownCard', function () { - browser.assert.hasClass(ZDAVitrineZeroDataCrown, 'OLSKCommonCrownCard'); + return browser.assert.hasClass(ZDAVitrineEasyIndieCrown, 'OLSKCommonCrownCard'); }); }); - describe('ZDAVitrineZeroDataCrownIcon', function () { + describe('ZDAVitrineEasyIndieCrownIcon', function () { it('sets role', function () { - browser.assert.attribute(ZDAVitrineZeroDataCrownIcon, 'role', 'presentation'); + return browser.assert.attribute(ZDAVitrineEasyIndieCrownIcon, 'role', 'presentation'); }); it('sets src', function () { - browser.assert.attribute(ZDAVitrineZeroDataCrownIcon, 'src', process.env.ZDA_VITRINE_EASY_INDIE_IDENTITY_URL); + return browser.assert.attribute(ZDAVitrineEasyIndieCrownIcon, 'src', process.env.ZDA_VITRINE_EASY_INDIE_IDENTITY_URL); }); }); - describe('ZDAVitrineZeroDataCrownName', function test_ZDAVitrineZeroDataCrownName () { + describe('ZDAVitrineEasyIndieCrownName', function test_ZDAVitrineEasyIndieCrownName () { it('sets href', function () { - browser.assert.attribute(ZDAVitrineZeroDataCrownName, 'href', process.env.ZDA_VITRINE_EASY_INDIE_URL); + return browser.assert.attribute(ZDAVitrineEasyIndieCrownName, 'href', process.env.ZDA_VITRINE_EASY_INDIE_URL); }); it('sets text', function () { - browser.assert.text(ZDAVitrineZeroDataCrownName, 'Easy Indie App'); + return browser.assert.text(ZDAVitrineEasyIndieCrownName, 'Easy Indie App'); }); }); diff --git a/os-app/sub-events/ui-test-_access.js b/os-app/sub-events/ui-test-_access.js index 85e5379..5f8f90d 100644 --- a/os-app/sub-events/ui-test-_access.js +++ b/os-app/sub-events/ui-test-_access.js @@ -20,15 +20,15 @@ describe('ZDAVitrineEventsList_Access', function () { }); it('shows ZDAVitrineEventsList', function() { - browser.assert.elements(ZDAVitrineEventsList, 1); + return browser.assert.elements(ZDAVitrineEventsList, 1); }); it('shows ZDAVitrineEventsListEmpty', function () { - browser.assert.elements(ZDAVitrineEventsListEmpty, 1); + return browser.assert.elements(ZDAVitrineEventsListEmpty, 1); }); it('hides ZDAVitrineEventsListItem', function () { - browser.assert.elements(ZDAVitrineEventsListItem, 0); + return browser.assert.elements(ZDAVitrineEventsListItem, 0); }); context('ZDAVitrineEventsListData', function () { @@ -46,19 +46,19 @@ describe('ZDAVitrineEventsList_Access', function () { }); it('hides ZDAVitrineEventsListEmpty', function () { - browser.assert.elements(ZDAVitrineEventsListEmpty, 0); + return browser.assert.elements(ZDAVitrineEventsListEmpty, 0); }); it('shows ZDAVitrineEventsListItem', function () { - browser.assert.elements(ZDAVitrineEventsListItem, count); + return browser.assert.elements(ZDAVitrineEventsListItem, count); }); it('shows ZDAVitrineEventsListItemStart', function () { - browser.assert.elements(ZDAVitrineEventsListItemStart, count); + return browser.assert.elements(ZDAVitrineEventsListItemStart, count); }); it('shows ZDAVitrineEventsListItemLink', function () { - browser.assert.elements(ZDAVitrineEventsListItemLink, count); + return browser.assert.elements(ZDAVitrineEventsListItemLink, count); }); }); diff --git a/os-app/sub-events/ui-test-_localize.js b/os-app/sub-events/ui-test-_localize.js index 4f65f54..d3caf95 100644 --- a/os-app/sub-events/ui-test-_localize.js +++ b/os-app/sub-events/ui-test-_localize.js @@ -15,7 +15,7 @@ kDefaultRoute.OLSKRouteLanguageCodes.forEach(function (OLSKRoutingLanguage) { }); it('localizes ZDAVitrineEventsListEmpty', function () { - browser.assert.text(ZDAVitrineEventsListEmpty, uLocalized('ZDAVitrineEventsListEmptyText')); + return browser.assert.text(ZDAVitrineEventsListEmpty, uLocalized('ZDAVitrineEventsListEmptyText')); }); }); diff --git a/os-app/sub-events/ui-test-_misc.js b/os-app/sub-events/ui-test-_misc.js index ff71a77..a8d0151 100644 --- a/os-app/sub-events/ui-test-_misc.js +++ b/os-app/sub-events/ui-test-_misc.js @@ -19,7 +19,7 @@ describe('ZDAVitrineEventsList_Misc', function () { describe('ZDAVitrineEventsList', function test_ZDAVitrineEventsList () { it('sets lang', function () { - browser.assert.attribute(ZDAVitrineEventsList, 'lang', 'en'); + return browser.assert.attribute(ZDAVitrineEventsList, 'lang', 'en'); }); }); @@ -27,7 +27,7 @@ describe('ZDAVitrineEventsList_Misc', function () { describe('ZDAVitrineEventsListItemStart', function test_ZDAVitrineEventsListItemStart () { it('binds ZDAEventStart', function () { - browser.assert.text(ZDAVitrineEventsListItemStart, require('luxon').DateTime.fromJSDate(item.ZDAEventStart).toFormat('MMM dd')); + return browser.assert.text(ZDAVitrineEventsListItemStart, require('luxon').DateTime.fromJSDate(item.ZDAEventStart).toFormat('MMM dd')); }); }); @@ -35,15 +35,15 @@ describe('ZDAVitrineEventsList_Misc', function () { describe('ZDAVitrineEventsListItemLink', function test_ZDAVitrineEventsListItemLink () { it('sets href', function () { - browser.assert.attribute(ZDAVitrineEventsListItemLink, 'href', item.ZDAEventURL); + return browser.assert.attribute(ZDAVitrineEventsListItemLink, 'href', item.ZDAEventURL); }); it('sets target', function () { - browser.assert.attribute(ZDAVitrineEventsListItemLink, 'target', '_blank'); + return browser.assert.attribute(ZDAVitrineEventsListItemLink, 'target', '_blank'); }); it('binds ZDAEventName', function () { - browser.assert.text(ZDAVitrineEventsListItemLink, item.ZDAEventName); + return browser.assert.text(ZDAVitrineEventsListItemLink, item.ZDAEventName); }); }); diff --git a/os-app/sub-list/ui-test-_access.js b/os-app/sub-list/ui-test-_access.js index dd4e531..8b2fa94 100644 --- a/os-app/sub-list/ui-test-_access.js +++ b/os-app/sub-list/ui-test-_access.js @@ -22,15 +22,15 @@ describe('ZDAGlanceList_Access', function () { }); it('shows ZDAGlanceList', function() { - browser.assert.elements(ZDAGlanceList, 1); + return browser.assert.elements(ZDAGlanceList, 1); }); it('shows ZDAGlanceListEmpty', function () { - browser.assert.elements(ZDAGlanceListEmpty, 1); + return browser.assert.elements(ZDAGlanceListEmpty, 1); }); it('hides ZDAGlanceListItem', function () { - browser.assert.elements(ZDAGlanceListItem, 0); + return browser.assert.elements(ZDAGlanceListItem, 0); }); context('ZDAGlanceListData', function () { @@ -48,27 +48,27 @@ describe('ZDAGlanceList_Access', function () { }); it('hides ZDAGlanceListEmpty', function () { - browser.assert.elements(ZDAGlanceListEmpty, 0); + return browser.assert.elements(ZDAGlanceListEmpty, 0); }); it('shows ZDAGlanceListItem', function () { - browser.assert.elements(ZDAGlanceListItem, count); + return browser.assert.elements(ZDAGlanceListItem, count); }); it('shows ZDAGlanceListItemIcon', function () { - browser.assert.elements(ZDAGlanceListItemIcon, count); + return browser.assert.elements(ZDAGlanceListItemIcon, count); }); it('shows ZDAGlanceListItemIconImage', function () { - browser.assert.elements(ZDAGlanceListItemIconImage, count); + return browser.assert.elements(ZDAGlanceListItemIconImage, count); }); it('shows ZDAGlanceListItemName', function () { - browser.assert.elements(ZDAGlanceListItemName, count); + return browser.assert.elements(ZDAGlanceListItemName, count); }); it('shows ZDAGlanceListItemBlurb', function () { - browser.assert.elements(ZDAGlanceListItemBlurb, count); + return browser.assert.elements(ZDAGlanceListItemBlurb, count); }); }); diff --git a/os-app/sub-list/ui-test-_localize.js b/os-app/sub-list/ui-test-_localize.js index faf6ce9..612ad51 100644 --- a/os-app/sub-list/ui-test-_localize.js +++ b/os-app/sub-list/ui-test-_localize.js @@ -15,7 +15,7 @@ kDefaultRoute.OLSKRouteLanguageCodes.forEach(function (OLSKRoutingLanguage) { }); it('localizes ZDAGlanceListEmpty', function () { - browser.assert.text(ZDAGlanceListEmpty, uLocalized('ZDAGlanceListEmptyText')); + return browser.assert.text(ZDAGlanceListEmpty, uLocalized('ZDAGlanceListEmptyText')); }); }); diff --git a/os-app/sub-list/ui-test-_misc.js b/os-app/sub-list/ui-test-_misc.js index 498cf38..fa260d8 100644 --- a/os-app/sub-list/ui-test-_misc.js +++ b/os-app/sub-list/ui-test-_misc.js @@ -24,7 +24,7 @@ describe('ZDAGlanceList_Misc', function () { describe('ZDAGlanceList', function test_ZDAGlanceList () { it('sets lang', function () { - browser.assert.attribute(ZDAGlanceList, 'lang', 'en'); + return browser.assert.attribute(ZDAGlanceList, 'lang', 'en'); }); }); @@ -32,11 +32,11 @@ describe('ZDAGlanceList_Misc', function () { describe('ZDAGlanceListItem', function test_ZDAGlanceListItem () { it('classes OLSKCommonCard', function () { - browser.assert.hasClass(ZDAGlanceListItem, 'OLSKCommonCard'); + return browser.assert.hasClass(ZDAGlanceListItem, 'OLSKCommonCard'); }); it('sets data-protocols', function () { - browser.assert.attribute('.ZDAGlanceListItem', 'data-protocols', Object.values(item.ZDAProjectBanks).filter(function (e) { + return browser.assert.attribute('.ZDAGlanceListItem', 'data-protocols', Object.values(item.ZDAProjectBanks).filter(function (e) { return e.ZDABankProtocol; }).map(function (e) { return e.ZDABankProtocol.ZDAProtocolName; @@ -48,15 +48,15 @@ describe('ZDAGlanceList_Misc', function () { describe('ZDAGlanceListItemIcon', function test_ZDAGlanceListItemIcon () { it('sets href', function () { - browser.assert.attribute(ZDAGlanceListItemIcon, 'href', item.ZDAProjectURL); + return browser.assert.attribute(ZDAGlanceListItemIcon, 'href', item.ZDAProjectURL); }); it('sets aria-hidden', function () { - browser.assert.attribute(ZDAGlanceListItemIcon, 'aria-hidden', 'true'); + return browser.assert.attribute(ZDAGlanceListItemIcon, 'aria-hidden', 'true'); }); it('sets tabindex', function () { - browser.assert.attribute(ZDAGlanceListItemIcon, 'tabindex', '-1'); + return browser.assert.attribute(ZDAGlanceListItemIcon, 'tabindex', '-1'); }); }); @@ -64,7 +64,7 @@ describe('ZDAGlanceList_Misc', function () { describe('ZDAGlanceListItemIconImage', function test_ZDAGlanceListItemIconImage () { it('sets src', function () { - browser.assert.attribute(ZDAGlanceListItemIconImage, 'src', item._ZDAProjectIconURLCachedPath || item.ZDAProjectIconURL || '/_shared/__external/OLSKUIAssets/_OLSKSharedIconPlaceholder.svg'); + return browser.assert.attribute(ZDAGlanceListItemIconImage, 'src', item._ZDAProjectIconURLCachedPath || item.ZDAProjectIconURL || '/_shared/__external/OLSKUIAssets/_OLSKSharedIconPlaceholder.svg'); }); }); @@ -72,15 +72,15 @@ describe('ZDAGlanceList_Misc', function () { describe('ZDAGlanceListItemName', function test_ZDAGlanceListItemName () { it('sets href', function () { - browser.assert.attribute(ZDAGlanceListItemName, 'href', item.ZDAProjectURL); + return browser.assert.attribute(ZDAGlanceListItemName, 'href', item.ZDAProjectURL); }); it('sets target', function () { - browser.assert.attribute(ZDAGlanceListItemName, 'target', '_blank'); + return browser.assert.attribute(ZDAGlanceListItemName, 'target', '_blank'); }); it('binds ZDAProjectName', function () { - browser.assert.text(ZDAGlanceListItemName, item.ZDAProjectName); + return browser.assert.text(ZDAGlanceListItemName, item.ZDAProjectName); }); }); @@ -88,7 +88,7 @@ describe('ZDAGlanceList_Misc', function () { describe('ZDAGlanceListItemBlurb', function test_ZDAGlanceListItemBlurb () { it('binds ZDAProjectBlurb', function () { - browser.assert.text(ZDAGlanceListItemBlurb, item.ZDAProjectBlurb); + return browser.assert.text(ZDAGlanceListItemBlurb, item.ZDAProjectBlurb); }); }); diff --git a/os-app/task-a-banks/controller.js b/os-app/task-a-banks/controller.js index 80dd84f..7cd2362 100644 --- a/os-app/task-a-banks/controller.js +++ b/os-app/task-a-banks/controller.js @@ -276,7 +276,7 @@ const mod = { }, DataBankProjects () { - if (process.env.OLSK_FLAG_CI) { + if (process.env.OLSK_FLAG_CI || process.env.OLSK_SPEC_MOCHA_INTERFACE) { return []; } @@ -302,16 +302,12 @@ const mod = { }, DataBankProtocols () { - if (process.env.OLSK_FLAG_CI) { + if (process.env.OLSK_FLAG_CI || process.env.OLSK_SPEC_MOCHA_INTERFACE) { return []; } const _mod = process.env.npm_lifecycle_script === 'olsk-spec' ? this : mod; - if (process.env.OLSK_SPEC_MOCHA_INTERFACE) { - mod.SetupBanks(); - } - return _mod._DataBankProtocolObjects(_mod._OLSKCacheResultMap[ZDABank.ZDABankURLAwesome()]).map(function (e) { return Object.assign(e, { _ZDAProtocolIconURLCachedPath: _mod._DataFoilImages.DataCacheLocalPath(e.ZDAProtocolIconURL), @@ -336,16 +332,12 @@ const mod = { }, DataBankTools () { - if (process.env.OLSK_FLAG_CI) { + if (process.env.OLSK_FLAG_CI || process.env.OLSK_SPEC_MOCHA_INTERFACE) { return []; } const _mod = process.env.npm_lifecycle_script === 'olsk-spec' ? this : mod; - if (process.env.OLSK_SPEC_MOCHA_INTERFACE) { - mod.SetupBanks(); - } - return _mod._DataBankToolObjects(_mod._OLSKCacheResultMap[ZDABank.ZDABankURLAwesome()]); }, @@ -366,16 +358,12 @@ const mod = { }, DataBankInitiatives () { - if (process.env.OLSK_FLAG_CI) { + if (process.env.OLSK_FLAG_CI || process.env.OLSK_SPEC_MOCHA_INTERFACE) { return []; } const _mod = process.env.npm_lifecycle_script === 'olsk-spec' ? this : mod; - if (process.env.OLSK_SPEC_MOCHA_INTERFACE) { - mod.SetupBanks(); - } - return _mod._DataBankInitiativeObjects(_mod._OLSKCacheResultMap[ZDABank.ZDABankURLAwesome()]); }, diff --git a/os-app/tech-robots/ui-test-_misc.js b/os-app/tech-robots/ui-test-_misc.js index f9ff78e..3a986ed 100644 --- a/os-app/tech-robots/ui-test-_misc.js +++ b/os-app/tech-robots/ui-test-_misc.js @@ -3,7 +3,7 @@ const kDefaultRoute = require('./controller.js').OLSKControllerRoutes().shift(); describe('ZDARobots_Misc', function () { it('sends text', async function () { - browser.assert.deepEqual(await (await browser.fetch('http://localhost' + kDefaultRoute.OLSKRoutePath)).text(), require('OLSKRobots').OLSKRobotsTXT([ + return browser.assert.deepEqual(await (await browser.fetch('http://localhost' + kDefaultRoute.OLSKRoutePath)).text(), require('OLSKRobots').OLSKRobotsTXT([ require('../open-vitrine/controller.js').OLSKControllerRoutes().shift(), require('../open-glance/controller.js').OLSKControllerRoutes().shift(), require('../api-projects/controller.js').OLSKControllerRoutes().shift(),