Fixed js test runner for phantom

Author: dmjio

.travis.yml

@@ -6,4 +6,4 @@ script:
   - nix-channel --add https://nixos.org/channels/nixos-16.09 nixpkgs
   - nix-channel --update
   - nix-build release.nix
-  - phantomjs --web-security=no jsbits/options.js dist/build/ghcjs-tests/ghcjs-tests.jsexe/index.html
+  - phantomjs --web-security=no jsbits/options.js result-2/bin/ghcjs-tests.jsexe/index.html

ghcjs-tests/Test.hs

@@ -1,14 +1,18 @@
 {-# LANGUAGE OverloadedStrings    #-}
 {-# LANGUAGE ScopedTypeVariables  #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
+{-# LANGUAGE RecordWildCards      #-}
 module Main where
 
 import Control.Applicative
 import Data.Aeson
 import Data.Either               (isRight)
+import Data.JSString
 import Generics.SOP.Arbitrary
 import Generics.SOP.Universe
-import Test.Hspec                (it, hspec, describe, shouldSatisfy, shouldBe)
+import System.Exit
+import Test.Hspec (it, hspec, describe, shouldSatisfy, shouldBe)
+import Test.Hspec.Core.Runner (hspecResult, Summary(..))
 import Test.QuickCheck
 import Test.QuickCheck.Instances ()
 
@@ -67,7 +71,7 @@ instance Generic Descendants
 
 main :: IO ()
 main = do
- hspec $ do
+ Summary{..} <- hspecResult $ do
   describe "HackerNews API tests" $ do
     it "should round trip Updates JSON" $ property $ \(x :: Updates) ->
        Just x == decode (encode x)
@@ -98,4 +102,9 @@ main = do
       (`shouldSatisfy` isRight) =<< getJobStories
     it "should retrieve updates" $ do
       (`shouldSatisfy` isRight) =<< getUpdates
- putStr "done"
+ case summaryFailures of
+   x | x > 0 -> putStrLn "error"
+     | otherwise -> putStrLn "done"
+
+
+

hackernews.cabal

@@ -31,6 +31,7 @@ executable ghcjs-tests
                , hackernews
                , ghcjs-base
                , hspec
+               , hspec-core
                , basic-sop
                , generics-sop
                , quickcheck-instances

hackernews.nix

@@ -1,7 +1,7 @@
 { mkDerivation, aeson, base, hspec, http-client, http-client-tls
 , servant, servant-client, stdenv, text, transformers, compiler
 , quickcheck-instances, basic-sop, servant-quickcheck, nixpkgs, generics-sop
-, http-types, string-conversions
+, http-types, string-conversions, hspec-core
 }:
 let
  phantomjs  = nixpkgs.nodePackags.phantomjs;
@@ -12,7 +12,7 @@ let
     transformers http-client-tls http-types string-conversions
     quickcheck-instances
    ];
- ghcjs-deps = [ basic-sop' generics-sop
+ ghcjs-deps = [ basic-sop' generics-sop hspec-core
                 ghcjs-base aeson base text
                 transformers hspec servant quickcheck-instances
                 string-conversions ];

jsbits/options.js

@@ -4,16 +4,25 @@ if (system.args.length !== 2) {
     console.log('Usage: phantomjsOpen.js URL');
     phantom.exit(1);
 }
+
 var page = require('webpage').create();
 
-page.onConsoleMessage = function (msg) {
-    console.log(msg);
-};
 page.onError = function (msg, trace) {
-    error.append(msg);
-    console.log(msg);
+  if (msg.match("error").length > 0) {
+    phantom.exit(1);
+  }
 };
+
 page.open(system.args[1], function (status) {
+    page.onConsoleMessage = function (msg) {
+	if (msg.match("done")) {
+	    phantom.exit(0);
+	} else if (msg.match("error")) {
+	    phantom.exit(1);
+	} else {
+	    console.log(msg);
+	}
+    };
     if (status !== "success") {
         console.log("Unable to open " + system.args[1]);
         phantom.exit(1);