Simplify integration test setup, don't post artefact to imagebin, log as dataURI to console

cburgmer · cburgmer · commit b5256ae8f995 · 2018-03-18T12:20:39.000+01:00
diff --git a/.travis.yml b/.travis.yml
@@ -6,8 +6,6 @@ env:
   - DISPLAY=:99.0
 before_script:
   - sh -e /etc/init.d/xvfb start
-script:
-  - npm test publish_smoke_test_diff
 deploy:
   provider: npm
   email: christoph.burgmer@gmail.com
diff --git a/go b/go
@@ -1,33 +1,6 @@
 #!/bin/bash
 set -e
 
-PUBLISH_SMOKE_TEST_DIFF="$1"
-SMOKE_TEST_DIFF="build/rasterizeHtmlSmokeTestDiff.png"
-
-installDependencies() {
-    npm install
-}
-
-build() {
-    ./node_modules/.bin/grunt
-}
-
-runIntegrationTest() {
-    ./node_modules/.bin/slimerjs test/phantomIntegrationTest.js
-}
-
-main() {
-    if [ ! -d node_modules ]; then
-        installDependencies
-    fi
-
-    build
-    if ! ./test/integrationTest.js; then
-        if [[ -n "$PUBLISH_SMOKE_TEST_DIFF" ]]; then
-            curl -F file="@${SMOKE_TEST_DIFF}" https://imagebin.ca/upload.php
-        fi
-        exit 1
-    fi
-}
-
-main
+npm install
+./node_modules/.bin/grunt
+./test/integrationTest.js
diff --git a/test/diffHelperPage.html b/test/diffHelperPage.html
@@ -48,8 +48,12 @@
                 });
             });
         };
-
     </script>
+    <style>
+        body {
+            margin: 0;
+        }
+    </style>
 </head>
 <body>
 </body>
diff --git a/test/integrationTest.js b/test/integrationTest.js
@@ -7,14 +7,20 @@
 const path = require("path");
 const puppeteer = require('puppeteer');
 
+const viewport = { width: 200, height: 100 };
+
 const fileUrl = (relPath) => {
     return 'file://' + path.resolve(process.cwd(), relPath);
 };
 
-var dataUriForBase64PNG = (pngBase64) => {
-    return "data:image/png;base64," + pngBase64;
+const screenshotToDataUri = (screenshot) => {
+    return "data:image/png;base64," + screenshot.toString('base64');
 };
 
+const sleep = async (inMs) => {
+    await new Promise(fulfill => setTimeout(fulfill, inMs));
+}
+
 const renderPage = async (browser, url, successCallback) => {
     const page = await browser.newPage();
 
@@ -26,31 +32,30 @@ const renderPage = async (browser, url, successCallback) => {
     page.on('pageerror', msg => {
         console.error(msg);
     });
-    await page.setViewport({ width: 200, height: 100 });
+    await page.setViewport(viewport);
     await page.goto(url);
 
-    await new Promise(fulfill => setTimeout(fulfill, 500));
+    await sleep(500);
 
     const screenshot = await page.screenshot();
-    return dataUriForBase64PNG(screenshot.toString('base64'));
+    return screenshotToDataUri(screenshot);
 };
 
 const runTest = async (browser) => {
     const imageUrl = await renderPage(browser, fileUrl('test/integrationTestPage.html'));
     const targetImageUrl = await renderPage(browser, fileUrl('test/fixtures/testResult.png'));
-    console.log('imageUrl', imageUrl);
-    console.log('targetImageUrl', targetImageUrl);
+    console.log('Rendered test page', imageUrl);
 
     const imageDiffPage = await browser.newPage();
+    await imageDiffPage.setViewport(viewport);
     await imageDiffPage.goto(fileUrl('test/diffHelperPage.html'));
 
     const equal = await imageDiffPage.evaluate(function (url1, url2) {
         return isEqual(url1, url2, 5);
     }, imageUrl, targetImageUrl);
 
-    const screenshotTarget = 'build/rasterizeHtmlSmokeTestDiff.png';
-    console.log('Writing diff to ' + screenshotTarget);
-    await imageDiffPage.screenshot({path: screenshotTarget});
+    const screenshot = await imageDiffPage.screenshot();
+    console.log('Rendered diff', screenshotToDataUri(screenshot));
 
     return equal;
 };
