Move phantom runner test code to phantom test environment to integrat…

…e against actual environment. That would have discovered the inline issue. Conflicts: Gruntfile.js test/SpecRunner.html test/run-phantomjs-tests.js
cburgmer · Mar 6, 2014 · 2cbb14e · 2cbb14e
1 parent a4269d3
commit 2cbb14e
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 3 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -6,15 +6,12 @@ module.exports = function (grunt) {
             src: [
                 'bower_components/rasterizeHTML.js/dist/rasterizeHTML.allinone.js',
                 'bower_components/js-imagediff/imagediff.js',
-                'bower_components/jssha/src/sha256.js',
                 'src/utils.js',
                 'src/phantomjsrenderer.js',
                 'src/browserrenderer.js',
                 'src/domstorage.js',
                 'src/<%= pkg.name %>.js',
                 'src/basichtmlreporter.js',
-                'src/terminalreporter.js',
-                'src/signoffreporter.js'
             ],
             options: {
                 specs: ['test/specsShared/*', 'test/specs/*'],

diff --git a/test/run-phantomjs-tests.js b/test/run-phantomjs-tests.js
@@ -15,10 +15,15 @@ function loadJasmine() {
 function loadCode() {
     phantom.injectJs("./test/helpers.js");
 
+    phantom.injectJs("./src/phantomjsbind.js");
+    phantom.injectJs("./bower_components/rasterizeHTML.js/dist/rasterizeHTML.allinone.js");
+    phantom.injectJs("./bower_components/jssha/src/sha256.js");
     phantom.injectJs("./bower_components/js-imagediff/imagediff.js");
     phantom.injectJs("./src/utils.js");
     phantom.injectJs("./src/phantomjsrenderer.js");
+    phantom.injectJs("./src/terminalreporter.js");
     phantom.injectJs("./src/htmlfilereporter.js");
+    phantom.injectJs("./src/signoffreporter.js");
     phantom.injectJs("./src/filestorage.js");
     phantom.injectJs("./src/csscritic.js");
 }
@@ -29,6 +34,10 @@ function loadTests() {
     phantom.injectJs("./specsPhantom/FileStorageSpec.js");
     phantom.injectJs("./specsPhantom/PhantomJSRendererSpec.js");
     phantom.injectJs("./specsPhantom/HtmlFileReporterSpec.js");
+    phantom.injectJs("./specsPhantom/TerminalReporterSpec.js");
+    phantom.injectJs("./specsPhantom/SignOffReporterUtilSpec.js");
+    phantom.injectJs("./specsPhantom/SignOffReporterSpec.js");
+
 }
 
 function startWebserver() {

diff --git a/test/specs/SignOffReporterSpec.js → test/specsPhantom/SignOffReporterSpec.js b/test/specs/SignOffReporterSpec.js → test/specsPhantom/SignOffReporterSpec.js
diff --git a/test/specs/SignOffReporterUtilSpec.js → test/specsPhantom/SignOffReporterUtilSpec.js b/test/specs/SignOffReporterUtilSpec.js → test/specsPhantom/SignOffReporterUtilSpec.js
diff --git a/test/specs/TerminalReporterSpec.js → test/specsPhantom/TerminalReporterSpec.js b/test/specs/TerminalReporterSpec.js → test/specsPhantom/TerminalReporterSpec.js