Augment tests for no-js

integration-tests/helpers/visit.js

@@ -13,6 +13,10 @@ async function visit(route, options, callback) {
   let browser = await puppeteer.launch({ args: ['--no-sandbox'] });
   let page = await browser.newPage();
 
+  if (options.disableJavascript) {
+    page.setJavaScriptEnabled(false);
+  }
+
   // make sure old service workers are gone…
   await page._client.send('ServiceWorker.enable');
   await page._client.send('ServiceWorker.stopAllWorkers');

integration-tests/nojs-test.js

@@ -0,0 +1,23 @@
+const { expect } = require('chai');
+const visit = require('./helpers/visit');
+
+describe('the main flow without javascript', function() {
+  it('works', async function() {
+    await visit('/', { disableJavascript: false }, async (page) => {
+      await page.type('[data-test-search-input]', 'Salzburg');
+      await page.click('[data-test-search-submit]');
+      await page.waitForSelector('[data-test-search-result="Salzburg"]');
+
+      expect(page.url()).to.match(/\/search\/Salzburg$/);
+
+      await page.click('[data-test-search-result="Salzburg"] a');
+      await page.waitForSelector('[data-test-location]');
+
+      expect(page.url()).to.match(/\/location\/2$/);
+
+      let element = await page.waitForSelector('[data-test-measurement="PM10"] [data-test-measurement-value="15"]');
+
+      expect(element).to.be.ok;
+    });
+  });
+});

integration-tests/routes/search-test.js

@@ -89,19 +89,18 @@ describe('the search route', function() {
       });
     });
 
-    describe('with no js', function() {
-      it('redirects query param to url', async function() {
-        await visit('/search?search-term=Munich', async (page) => {
-          expect(page.url()).to.have.path('/search/Munich');
-        });
+    it('redirects query param to url', async function() {
+      await visit('/search?search-term=Munich', async (page) => {
+        expect(page.url()).to.have.path('/search/Munich');
       });
-      it('redirects /search-by-coordinates', async function() {
-        await visit('/search-by-coordinates', async (page, $response) => {
-          expect(page.url()).to.have.path('/search/0,0');
+    });
 
-          let error = $response('[data-test-coordinates-error]');
-          expect(error).to.be.ok;
-        });
+    it('redirects /search-by-coordinates', async function() {
+      await visit('/search-by-coordinates', async (page, $response) => {
+        expect(page.url()).to.have.path('/search/0,0');
+
+        let error = $response('[data-test-coordinates-error]');
+        expect(error).to.be.ok;
       });
     });
   });
@@ -227,4 +226,27 @@ describe('the search route', function() {
       });
     });
   });
+
+  describe('without javascript', function() {
+    it('renders search results', async function() {
+      await visit('/search/Salzburg', { disableJavascript: true }, async(page, $response) => {
+
+        await page.waitForSelector('[data-test-search-result="Salzburg"]');
+        await page.click('[data-test-search-result="Salzburg"] a');
+        await page.waitForSelector('[data-test-location]');
+
+        expect(page.url()).to.have.path('/location/2');
+      });
+    });
+
+    it('allows searching', async function() {
+      await visit('/search/', { disableJavascript: true }, async(page, $response) => {
+        await page.type('[data-test-search-input]', 'Salzburg');
+        await page.click('[data-test-search-submit]');
+        await page.waitForSelector('[data-test-search-result="Salzburg"]');
+
+        expect(page.url()).to.have.path('/search/Salzburg');
+      });
+    });
+  });
 });

integration-tests/user-flow-test.js

@@ -39,24 +39,4 @@ describe('the main user flow', function() {
       expect(element).to.be.ok;
     });
   });
-
-  it('works without JS', async function() {
-    await visit('/search/Salzburg', async (page) => {
-      await page.setJavaScriptEnabled(false);
-      await page.reload();
-      await page.waitForSelector('[data-test-search-result="Salzburg"]');
-      await page.click('[data-test-search-result="Salzburg"] a');
-      await page.waitForSelector('[data-test-location]');
-
-      expect(page.url()).to.match(/\/location\/2$/);
-
-      let element = await page.waitForSelector('[data-test-measurement="PM10"] [data-test-measurement-value="15"]');
-
-      expect(element).to.be.ok;
-
-      await page.click('[data-test-home-link]');
-
-      expect(page.url()).to.match(/\/$/);
-    });
-  });
 });