From 5dc3d391c65548d5edc609d39558ee03e2d3a683 Mon Sep 17 00:00:00 2001 From: Ben Plessinger Date: Tue, 10 Sep 2019 09:12:48 -0400 Subject: [PATCH] update roadmap url (#1031) update roadmap url and reenable tests --- .../Migration/Version812To850/ConfigFilesMigration.php | 7 ++++++- configuration/portal_settings.ini | 2 +- tests/ui/test/specs/xdmod/about.js | 4 ++-- tests/ui/test/specs/xdmod/about.page.js | 3 +-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/classes/OpenXdmod/Migration/Version812To850/ConfigFilesMigration.php b/classes/OpenXdmod/Migration/Version812To850/ConfigFilesMigration.php index 4925e194d8..ee73653824 100644 --- a/classes/OpenXdmod/Migration/Version812To850/ConfigFilesMigration.php +++ b/classes/OpenXdmod/Migration/Version812To850/ConfigFilesMigration.php @@ -103,9 +103,14 @@ public function execute() 'data_warehouse_export_export_directory' => '/var/spool/xdmod/export', 'data_warehouse_export_retention_duration_days' => 30 ]); - + $data = parse_ini_file($this->portalSettingsPath, true); + $roadmapUrl = 'https://trello.com/embed/board?id=mdFESh6j'; + if('https://trello.com/b/mdFESh6j.html' !== $data['roadmap']['url']){ + $roadmapUrl = $data['roadmap']['url']; + } $this->writePortalSettingsFile(array_merge( ['features_user_dashboard' => $dashboard], + ['roadmap_url' => $roadmapUrl], $exportSettings )); } diff --git a/configuration/portal_settings.ini b/configuration/portal_settings.ini index 6e061d9017..84a302cc88 100644 --- a/configuration/portal_settings.ini +++ b/configuration/portal_settings.ini @@ -61,7 +61,7 @@ dw_desc_cache = "off" ; Settings that control the "Roadmap" action on the "About" tab. [roadmap] -url = "https://trello.com/b/mdFESh6j.html" +url = "https://trello.com/embed/board?id=mdFESh6j" header = "Located below is the XDMoD Development roadmap, organized by XDMoD release and powered by Trello.com. To view the full roadmap as well as vote and comment on features click any one of the elements on the roadmap. This will take you to the full roadmap on the Trello.com site in a new browser window (or tab). All users will be able to view the roadmap, however if you wish to vote or comment on a feature you will need to create a (free) Trello account if you do not already have one." [rest] diff --git a/tests/ui/test/specs/xdmod/about.js b/tests/ui/test/specs/xdmod/about.js index 9e97f3ff1d..5230e5004a 100644 --- a/tests/ui/test/specs/xdmod/about.js +++ b/tests/ui/test/specs/xdmod/about.js @@ -24,7 +24,7 @@ describe('About', function about() { it('SUPReMM', function checkNavEntrySUPReMM() { Abt.checkTab('SUPReMM'); }); - it.skip('Roadmap', function checkNavEntryXDMoD() { + it('Roadmap', function checkNavEntryXDMoD() { Abt.checkRoadmap(); }); it('Team', function checkNavEntryXDMoD() { @@ -73,7 +73,7 @@ describe('About', function about() { it('SUPReMM', function checkNavEntrySUPReMM() { Abt.checkTab('SUPReMM'); }); - it.skip('Roadmap', function checkNavEntryXDMoD() { + it('Roadmap', function checkNavEntryXDMoD() { Abt.checkRoadmap(); }); it('Team', function checkNavEntryXDMoD() { diff --git a/tests/ui/test/specs/xdmod/about.page.js b/tests/ui/test/specs/xdmod/about.page.js index 6e351bab78..ba23b7408b 100644 --- a/tests/ui/test/specs/xdmod/about.page.js +++ b/tests/ui/test/specs/xdmod/about.page.js @@ -24,8 +24,7 @@ class About { expect(err).to.be.a('undefined'); expect(result).to.not.be.a('null'); }); - browser.waitForExist('.trello-lists', 30000); - browser.waitForText('.trello-lists', 30000); + browser.waitForExist('.board-tile-container', 30000); browser.frameParent(); }