Skip to content

Commit

Permalink
Rename initiatives
Browse files Browse the repository at this point in the history
  • Loading branch information
rosano committed Dec 12, 2023
1 parent 7473a2b commit 5872536
Show file tree
Hide file tree
Showing 10 changed files with 71 additions and 71 deletions.
2 changes: 1 addition & 1 deletion os-app/open-vitrine/i18n-en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ ZDAVitrineProtocolsHeadingText: Protocols
ZDAVitrineToolsHeadingText: Tools
ZDAVitrineEventsHeadingText: Events
ZDAVitrineGroupDiscussionHeadingText: Previously on 0data…
ZDAVitrineInitiativesHeadingText: Adjacent initiatives
ZDAVitrineAdjacentHeadingText: Adjacent
ZDAVitrineAlsoHeadingText: See also
ZDAVitrineEasyIndieCrownBlurbText: Run your own X in a few clicks.
2 changes: 1 addition & 1 deletion os-app/open-vitrine/i18n-es.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ ZDAVitrineProtocolsHeadingText: Protocolos
ZDAVitrineToolsHeadingText: Herramientas
ZDAVitrineEventsHeadingText: Eventos
ZDAVitrineGroupDiscussionHeadingText: Anteriormente en 0data…
ZDAVitrineInitiativesHeadingText: Iniciativas adyacentes
ZDAVitrineAdjacentHeadingText: Adyacente
ZDAVitrineAlsoHeadingText: Ver también
ZDAVitrineEasyIndieCrownBlurbText: Ejecutar tu proprio X en pocos clics.
2 changes: 1 addition & 1 deletion os-app/open-vitrine/i18n-fr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ ZDAVitrineProtocolsHeadingText: Les protocoles
ZDAVitrineToolsHeadingText: Des outils
ZDAVitrineEventsHeadingText: Des événements
ZDAVitrineGroupDiscussionHeadingText: Antérieurement sur 0data…
ZDAVitrineInitiativesHeadingText: Initiatives adjacentes
ZDAVitrineAdjacentHeadingText: Adjacente
ZDAVitrineAlsoHeadingText: Voir aussi
ZDAVitrineEasyIndieCrownBlurbText: Exécuter votre propre X avec peu de clic.
2 changes: 1 addition & 1 deletion os-app/open-vitrine/i18n-pt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ ZDAVitrineProtocolsHeadingText: Protocolos
ZDAVitrineToolsHeadingText: Ferramentas
ZDAVitrineEventsHeadingText: Eventos
ZDAVitrineGroupDiscussionHeadingText: Anteriormente em 0data…
ZDAVitrineInitiativesHeadingText: Iniciativas adjacentes
ZDAVitrineAdjacentHeadingText: Adjacentes
ZDAVitrineAlsoHeadingText: Ver também
ZDAVitrineEasyIndieCrownBlurbText: Executar seu próprio X em poucos cliques.
26 changes: 13 additions & 13 deletions os-app/open-vitrine/ui-test-_access.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ Object.entries({
ZDAVitrineGroupDiscussionHeading: '.ZDAVitrineGroupDiscussionHeading',
ZDAVitrineGroupDiscussionVideo: '.ZDAVitrineGroupDiscussionVideo',

ZDAVitrineInitiativesHeading: '.ZDAVitrineInitiativesHeading',
ZDAVitrineInitiativesContainer: '.ZDAVitrineInitiativesContainer',
ZDAVitrineInitiativesLink: '.ZDAVitrineInitiativesLink',
ZDAVitrineInitiativesBlurb: '.ZDAVitrineInitiativesBlurb',
ZDAVitrineAdjacentHeading: '.ZDAVitrineAdjacentHeading',
ZDAVitrineAdjacentContainer: '.ZDAVitrineAdjacentContainer',
ZDAVitrineAdjacentLink: '.ZDAVitrineAdjacentLink',
ZDAVitrineAdjacentBlurb: '.ZDAVitrineAdjacentBlurb',

ZDAVitrineAlsoHeading: '.ZDAVitrineAlsoHeading',
ZDAVitrineEasyIndieCrown: '.ZDAVitrineEasyIndieCrown',
Expand All @@ -47,7 +47,7 @@ describe('ZDAVitrine_Access', function () {

const protocols = require('../task-a-banks/controller.js').DataBankProtocols().length;
const tools = require('../task-a-banks/controller.js').DataBankTools().length;
const initiatives = require('../task-a-banks/controller.js').DataBankInitiatives().length;
const adjacent = require('../task-a-banks/controller.js').DataBankAdjacent().length;

before(function() {
return browser.visit(kDefaultRoutePath);
Expand Down Expand Up @@ -149,20 +149,20 @@ describe('ZDAVitrine_Access', function () {
return browser.assert.elements(ZDAVitrineGroupDiscussionVideo, 1);
});

it('shows ZDAVitrineInitiativesHeading', function () {
return browser.assert.elements(ZDAVitrineInitiativesHeading, 1);
it('shows ZDAVitrineAdjacentHeading', function () {
return browser.assert.elements(ZDAVitrineAdjacentHeading, 1);
});

it('shows ZDAVitrineInitiativesContainer', function () {
return browser.assert.elements(ZDAVitrineInitiativesContainer, 1);
it('shows ZDAVitrineAdjacentContainer', function () {
return browser.assert.elements(ZDAVitrineAdjacentContainer, 1);
});

it.skip('shows ZDAVitrineInitiativesLink', function () {
return browser.assert.elements(ZDAVitrineInitiativesLink, initiatives);
it.skip('shows ZDAVitrineAdjacentLink', function () {
return browser.assert.elements(ZDAVitrineAdjacentLink, adjacent);
});

it.skip('shows ZDAVitrineInitiativesBlurb', function () {
return browser.assert.elements(ZDAVitrineInitiativesBlurb, initiatives);
it.skip('shows ZDAVitrineAdjacentBlurb', function () {
return browser.assert.elements(ZDAVitrineAdjacentBlurb, adjacent);
});

it('shows ROCOGazette', function () {
Expand Down
4 changes: 2 additions & 2 deletions os-app/open-vitrine/ui-test-_localize.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ kDefaultRoute.OLSKRouteLanguageCodes.forEach(function (OLSKRoutingLanguage) {
return browser.assert.text(ZDAVitrineGroupDiscussionHeading, uLocalized('ZDAVitrineGroupDiscussionHeadingText'));
});

it('localizes ZDAVitrineInitiativesHeading', function () {
return browser.assert.text(ZDAVitrineInitiativesHeading, uLocalized('ZDAVitrineInitiativesHeadingText'));
it('localizes ZDAVitrineAdjacentHeading', function () {
return browser.assert.text(ZDAVitrineAdjacentHeading, uLocalized('ZDAVitrineAdjacentHeadingText'));
});

it('localizes ZDAVitrineAlsoHeading', function () {
Expand Down
24 changes: 12 additions & 12 deletions os-app/open-vitrine/ui-test-_misc.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +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();
const adjacent = require('../task-a-banks/controller.js').DataBankAdjacent();

before(function () {
return browser.visit(kDefaultRoute.OLSKRoutePath);
Expand Down Expand Up @@ -154,42 +154,42 @@ describe('ZDAVitrine_Misc', function () {

});

describe('ZDAVitrineInitiativesContainer', function test_ZDAVitrineInitiativesContainer() {
describe('ZDAVitrineAdjacentContainer', function test_ZDAVitrineAdjacentContainer() {

it('classes OLSKDecorGlossary', function () {
return browser.assert.hasClass(ZDAVitrineInitiativesContainer, 'OLSKDecorGlossary');
return browser.assert.hasClass(ZDAVitrineAdjacentContainer, 'OLSKDecorGlossary');
});

it('sets lang', function () {
return browser.assert.attribute(ZDAVitrineInitiativesContainer, 'lang', 'en');
return browser.assert.attribute(ZDAVitrineAdjacentContainer, 'lang', 'en');
});

});

initiatives.forEach(function (e, i) {
adjacent.forEach(function (e, i) {

context(e.ZDAInitiativeURL, function () {
context(e.ZDAAdjacentURL, function () {

describe('ZDAVitrineInitiativesLink', function test_ZDAVitrineInitiativesLink() {
describe('ZDAVitrineAdjacentLink', function test_ZDAVitrineAdjacentLink() {

it('sets href', function () {
return browser.assert.attribute(`dt:nth-of-type(${ i + 1 }) ${ ZDAVitrineInitiativesLink }`, 'href', e.ZDAInitiativeURL);
return browser.assert.attribute(`dt:nth-of-type(${ i + 1 }) ${ ZDAVitrineAdjacentLink }`, 'href', e.ZDAAdjacentURL);
});

it('sets target', function () {
return browser.assert.attribute(`dt:nth-of-type(${ i + 1 }) ${ ZDAVitrineInitiativesLink }`, 'target', '_blank');
return browser.assert.attribute(`dt:nth-of-type(${ i + 1 }) ${ ZDAVitrineAdjacentLink }`, 'target', '_blank');
});

it('sets text', function () {
return browser.assert.text(`dt:nth-of-type(${ i + 1 }) ${ ZDAVitrineInitiativesLink }`, e.ZDAInitiativeName);
return browser.assert.text(`dt:nth-of-type(${ i + 1 }) ${ ZDAVitrineAdjacentLink }`, e.ZDAAdjacentName);
});

});

describe('ZDAVitrineInitiativesBlurb', function test_ZDAVitrineInitiativesBlurb() {
describe('ZDAVitrineAdjacentBlurb', function test_ZDAVitrineAdjacentBlurb() {

it('sets text', function () {
return browser.assert.text(`${ ZDAVitrineInitiativesBlurb }:nth-of-type(${ i + 1 })`, e.ZDAInitiativeBlurb);
return browser.assert.text(`${ ZDAVitrineAdjacentBlurb }:nth-of-type(${ i + 1 })`, e.ZDAAdjacentBlurb);
});

});
Expand Down
10 changes: 5 additions & 5 deletions os-app/open-vitrine/ui-view.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,11 @@ locals.OLSKPageAssets = [
<h1 class="ZDAVitrineGroupDiscussionHeading"><%= OLSKLocalized('ZDAVitrineGroupDiscussionHeadingText') %></h1>
<iframe class="ZDAVitrineGroupDiscussionVideo" src="<%= process.env.ZDA_VITRINE_GROUP_DISCUSSION_VIDEO_URL %>" allowfullscreen></iframe>

<h1 class="ZDAVitrineInitiativesHeading"><%= OLSKLocalized('ZDAVitrineInitiativesHeadingText') %></h1>
<dl class="ZDAVitrineInitiativesContainer OLSKDecorGlossary" lang="en">
<% ZDAInitiatives().forEach(function (item) { -%>
<dt><a class="ZDAVitrineInitiativesLink" href="<%= item.ZDAInitiativeURL %>" target="_blank"><%= item.ZDAInitiativeName %></a></dt>
<dd class="ZDAVitrineInitiativesBlurb"><%= item.ZDAInitiativeBlurb %></dd>
<h1 class="ZDAVitrineAdjacentHeading"><%= OLSKLocalized('ZDAVitrineAdjacentHeadingText') %></h1>
<dl class="ZDAVitrineAdjacentContainer OLSKDecorGlossary" lang="en">
<% ZDAAdjacent().forEach(function (item) { -%>
<dt><a class="ZDAVitrineAdjacentLink" href="<%= item.ZDAAdjacentURL %>" target="_blank"><%= item.ZDAAdjacentName %></a></dt>
<dd class="ZDAVitrineAdjacentBlurb"><%= item.ZDAAdjacentBlurb %></dd>
<% }) -%>
</dl>

Expand Down
52 changes: 26 additions & 26 deletions os-app/task-a-banks/controller-tests.js
Original file line number Diff line number Diff line change
Expand Up @@ -777,63 +777,63 @@ describe('DataBankTools', function test_DataBankTools() {

});

describe('_DataBankInitiativeObjects', function test__DataBankInitiativeObjects() {
describe('_DataBankAdjacentObjects', function test__DataBankAdjacentObjects() {

const uBank = function (inputData = {}) {
const item = Object.assign({
ZDAInitiativeURL: Math.random().toString(),
ZDAInitiativeName: Math.random().toString(),
ZDAInitiativeBlurb: Math.random().toString(),
ZDAAdjacentURL: Math.random().toString(),
ZDAAdjacentName: Math.random().toString(),
ZDAAdjacentBlurb: Math.random().toString(),
}, inputData);

return `# Adjacent initiatives\n- [${ item.ZDAInitiativeName }](${ item.ZDAInitiativeURL }): ${ item.ZDAInitiativeBlurb }\n#`;
return `# Adjacent\n- [${ item.ZDAAdjacentName }](${ item.ZDAAdjacentURL }): ${ item.ZDAAdjacentBlurb }\n#`;
};

it('throws if not string', function () {
throws(function () {
mod._DataBankInitiativeObjects(null);
mod._DataBankAdjacentObjects(null);
}, /ZDAErrorInputNotValid/);
});

it('returns array', function () {
deepEqual(mod._DataBankInitiativeObjects(''), []);
deepEqual(mod._DataBankAdjacentObjects(''), []);
});

it('parses data', function () {
const ZDAInitiativeURL = Math.random().toString();
const ZDAInitiativeName = Math.random().toString();
const ZDAInitiativeBlurb = Math.random().toString();

deepEqual(mod._DataBankInitiativeObjects(uBank({
ZDAInitiativeURL,
ZDAInitiativeName,
ZDAInitiativeBlurb,
const ZDAAdjacentURL = Math.random().toString();
const ZDAAdjacentName = Math.random().toString();
const ZDAAdjacentBlurb = Math.random().toString();

deepEqual(mod._DataBankAdjacentObjects(uBank({
ZDAAdjacentURL,
ZDAAdjacentName,
ZDAAdjacentBlurb,
})), [{
ZDAInitiativeURL,
ZDAInitiativeName,
ZDAInitiativeBlurb,
ZDAAdjacentURL,
ZDAAdjacentName,
ZDAAdjacentBlurb,
}]);
});

});

describe('DataBankInitiatives', function test_DataBankInitiatives() {
describe('DataBankAdjacent', function test_DataBankAdjacent() {

const _DataBankInitiatives = function (inputData) {
const _DataBankAdjacent = function (inputData) {
const _mod = Object.assign(Object.assign({}, mod), {
_DataBankInitiativeObjects: (function () {}),
_DataBankAdjacentObjects: (function () {}),
}, inputData);
return _mod.DataBankInitiatives() || _mod;
return _mod.DataBankAdjacent() || _mod;
};

it('calls _DataBankInitiativeObjects', function () {
it('calls _DataBankAdjacentObjects', function () {
const item = Math.random().toString();
deepEqual(uCapture(function (_DataBankInitiativeObjects) {
_DataBankInitiatives({
deepEqual(uCapture(function (_DataBankAdjacentObjects) {
_DataBankAdjacent({
_OLSKCacheResultMap: {
[ZDABank.ZDABankURLAwesome()]: item,
},
_DataBankInitiativeObjects,
_DataBankAdjacentObjects,
});
}), [item]);
});
Expand Down
18 changes: 9 additions & 9 deletions os-app/task-a-banks/controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ const mod = {
ZDATools () {
return mod.DataBankTools();
},
ZDAInitiatives () {
return mod.DataBankInitiatives();
ZDAAdjacent () {
return mod.DataBankAdjacent();
},
};
},
Expand Down Expand Up @@ -341,30 +341,30 @@ const mod = {
return _mod._DataBankToolObjects(_mod._OLSKCacheResultMap[ZDABank.ZDABankURLAwesome()]);
},

_DataBankInitiativeObjects (inputData) {
_DataBankAdjacentObjects (inputData) {
if (typeof inputData !== 'string') {
throw new Error('ZDAErrorInputNotValid');
}

return inputData.split('# Adjacent initiatives').pop().split('#').shift().trim().split('\n-').filter(function (e) {
return inputData.split('# Adjacent').pop().split('#').shift().trim().split('\n-').filter(function (e) {
return !!e;
}).map(function (e) {
return {
ZDAInitiativeURL: e.match(/\(.*\)/)[0].slice(1, -1),
ZDAInitiativeName: e.match(/\[.*\]/)[0].slice(1, -1),
ZDAInitiativeBlurb: e.split(': ').pop(),
ZDAAdjacentURL: e.match(/\(.*\)/)[0].slice(1, -1),
ZDAAdjacentName: e.match(/\[.*\]/)[0].slice(1, -1),
ZDAAdjacentBlurb: e.split(': ').pop(),
};
});
},

DataBankInitiatives () {
DataBankAdjacent () {
if (process.env.OLSK_FLAG_CI || process.env.OLSK_SPEC_MOCHA_INTERFACE) {
return [];
}

const _mod = process.env.npm_lifecycle_script === 'olsk-spec' ? this : mod;

return _mod._DataBankInitiativeObjects(_mod._OLSKCacheResultMap[ZDABank.ZDABankURLAwesome()]);
return _mod._DataBankAdjacentObjects(_mod._OLSKCacheResultMap[ZDABank.ZDABankURLAwesome()]);
},

// SETUP
Expand Down

0 comments on commit 5872536

Please sign in to comment.