From 06acfbb61c3858583e97d754f895f188ccafced6 Mon Sep 17 00:00:00 2001 From: jwzimmer Date: Wed, 19 Jul 2017 12:58:14 -0400 Subject: [PATCH] Issue/gh 1371 update tests post tips navbar change (#1412) * Update compatibility requirements to clarify support for ChromeOS * update tests after changes to footer links and navbar --- .../smoke-testing/test_footer_links.js | 50 +++++++++++-------- .../smoke-testing/test_navbar_links.js | 20 ++------ 2 files changed, 34 insertions(+), 36 deletions(-) diff --git a/test/integration/smoke-testing/test_footer_links.js b/test/integration/smoke-testing/test_footer_links.js index 9af93f3aa..57349d152 100644 --- a/test/integration/smoke-testing/test_footer_links.js +++ b/test/integration/smoke-testing/test_footer_links.js @@ -20,7 +20,7 @@ var rootUrl = process.env.ROOT_URL || 'https://scratch.ly'; var options = { timeout: 20000 }; //number of tests in the plan -tap.plan(24); +tap.plan(25); tap.tearDown(function () { //quit the instance of the browser @@ -115,9 +115,9 @@ tap.test('clickJobsLink', options, function (t) { // PRESS tap.test('clickPressLink', options, function (t) { var linkText = 'Press'; - var expectedHref = 'https://wiki.scratch.mit.edu/wiki/Scratch_Press'; + var expectedUrl = 'https://wiki.scratch.mit.edu/wiki/Scratch_Press'; clickFooterLinks(linkText).then( function (url) { - t.equal(url, expectedHref); + t.equal(url, expectedUrl); t.end(); }); }); @@ -147,9 +147,9 @@ tap.test('clickDiscussionForumsLink', options, function (t) { // SCRATCH WIKI tap.test('clickScratchWikiLink', options, function (t) { var linkText = 'Scratch Wiki'; - var expectedHref = 'https://wiki.scratch.mit.edu/wiki/Scratch_Wiki_Home'; + var expectedUrl = 'https://wiki.scratch.mit.edu/wiki/Scratch_Wiki_Home'; clickFooterLinks(linkText).then( function (url) { - t.equal(url, expectedHref); + t.equal(url, expectedUrl); t.end(); }); }); @@ -166,10 +166,10 @@ tap.test('clickStatisticsLink', options, function (t) { // ==== SUPPORT column ==== -// HELP PAGE -tap.test('clickHelpPageLink', options, function (t) { - var linkText = 'Help Page'; - var expectedHref = '/help/'; +// TIPS PAGE +tap.test('clickTipsPageLink', options, function (t) { + var linkText = 'Tips'; + var expectedHref = '/tips'; clickFooterLinks(linkText).then( function (url) { t.equal(url.substr(-expectedHref.length), expectedHref); t.end(); @@ -189,7 +189,7 @@ tap.test('clickFAQLink', options, function (t) { // OFFLINE EDITOR tap.test('clickOfflineEditorLink', options, function (t) { var linkText = 'Offline Editor'; - var expectedHref = '/scratch2download/'; + var expectedHref = '/download'; clickFooterLinks(linkText).then( function (url) { t.equal(url.substr(-expectedHref.length), expectedHref); t.end(); @@ -206,12 +206,22 @@ tap.test('clickContactUsLink', options, function (t) { }); }); +// SCRATCH STORE +tap.test('clickScratchStoreLink', options, function (t) { + var linkText = 'Scratch Store'; + var expectedUrl = 'https://scratch-foundation.myshopify.com/'; + clickFooterLinks(linkText).then( function (url) { + t.equal(url, expectedUrl); + t.end(); + }); +}); + // DONATE tap.test('clickDonateLink', options, function (t) { var linkText = 'Donate'; - var expectedHref = 'https://secure.donationpay.org/scratchfoundation/'; + var expectedUrl = 'https://secure.donationpay.org/scratchfoundation/'; clickFooterLinks(linkText).then( function (url) { - t.equal(url.substr(-expectedHref.length), expectedHref); + t.equal(url, expectedUrl); t.end(); }); }); @@ -253,9 +263,9 @@ tap.test('clickDMCALink', options, function (t) { // SCRATCH ED (SCRATCHED) tap.test('clickScratchEdLink', options, function (t) { var linkText = 'ScratchEd'; - var expectedHref = 'http://scratched.gse.harvard.edu/'; + var expectedUrl = 'http://scratched.gse.harvard.edu/'; clickFooterLinks(linkText).then( function (url) { - t.equal(url, expectedHref); + t.equal(url, expectedUrl); t.end(); }); }); @@ -263,9 +273,9 @@ tap.test('clickScratchEdLink', options, function (t) { // SCRATCH JR (SCRATCHJR) tap.test('clickScratchJrLink', options, function (t) { var linkText = 'ScratchJr'; - var expectedHref = 'http://www.scratchjr.org/'; + var expectedUrl = 'http://www.scratchjr.org/'; clickFooterLinks(linkText).then( function (url) { - t.equal(url, expectedHref); + t.equal(url, expectedUrl); t.end(); }); }); @@ -273,9 +283,9 @@ tap.test('clickScratchJrLink', options, function (t) { // SCRATCH DAY tap.test('clickScratchDayLink', options, function (t) { var linkText = 'Scratch Day'; - var expectedHref = 'https://day.scratch.mit.edu/'; + var expectedUrl = 'https://day.scratch.mit.edu/'; clickFooterLinks(linkText).then( function (url) { - t.equal(url, expectedHref); + t.equal(url, expectedUrl); t.end(); }); }); @@ -293,9 +303,9 @@ tap.test('clickScratchConferenceLink', options, function (t) { // SCRATCH FOUNDATION tap.test('clickScratchFoundationLink', options, function (t) { var linkText = 'Scratch Foundation'; - var expectedHref = 'https://www.scratchfoundation.org/'; + var expectedUrl = 'https://www.scratchfoundation.org/'; clickFooterLinks(linkText).then( function (url) { - t.equal(url, expectedHref); + t.equal(url, expectedUrl); t.end(); }); }); diff --git a/test/integration/smoke-testing/test_navbar_links.js b/test/integration/smoke-testing/test_navbar_links.js index 42ac458e7..20e94ace5 100644 --- a/test/integration/smoke-testing/test_navbar_links.js +++ b/test/integration/smoke-testing/test_navbar_links.js @@ -18,7 +18,7 @@ var rootUrl = process.env.ROOT_URL || 'https://scratch.ly'; var driver = new seleniumWebdriver.Builder().withCapabilities(seleniumWebdriver.Capabilities.chrome()).build(); //number of tests in the plan -tap.plan(8); +tap.plan(7); tap.tearDown(function () { //quit the instance of the browser @@ -57,9 +57,9 @@ tap.test('checkExploreLinkWhenSignedOut', function (t) { }); }); -tap.test('checkDiscussLinkWhenSignedOut', function (t) { - var xPathLink = '//li[contains(@class, "link") and contains(@class, "discuss")]/a'; - var expectedHref = '/discuss'; +tap.test('checkTipsLinkWhenSignedOut', function (t) { + var xPathLink = '//li[contains(@class, "link") and contains(@class, "tips")]/a'; + var expectedHref = '/tips'; driver.findElement(seleniumWebdriver.By.xpath(xPathLink)) .then( function (element) { return element.getAttribute('href');}) @@ -81,18 +81,6 @@ tap.test('checkAboutLinkWhenSignedOut', function (t) { }); }); -tap.test('checkHelpLinkWhenSignedOut', function (t) { - var xPathLink = '//li[contains(@class, "link") and contains(@class, "help")]/a'; - var expectedHref = '/help'; - driver.findElement(seleniumWebdriver.By.xpath(xPathLink)) - .then( function (element) { - return element.getAttribute('href');}) - .then( function (url) { - t.equal(url.substr(-expectedHref.length), expectedHref); - t.end(); - }); -}); - // ==== Search bar ==== tap.test('checkSearchBar', function (t) {