git.iko.soy/jsaddle
on master help sign in
Fixes for travis (support for different webkitgtk)
dcbc28eHamish Mackenzie
.travis.yml+4
compare with master
unifiedsplit
@@ -28,11 +28,15 @@ install:
28 - cabal update
28 - cabal update
29 - cabal install Cabal cabal-install
29 - cabal install Cabal cabal-install
30 - cabal install gtk2hs-buildtools
30 - cabal install gtk2hs-buildtools
31+ - ghc --version
32+ - cabal --version
31
33
32script:
34script:
33 - cabal install --only-dependencies --enable-tests --force-reinstalls
35 - cabal install --only-dependencies --enable-tests --force-reinstalls
34 - cabal configure --enable-tests
36 - cabal configure --enable-tests
35 - cabal build
37 - cabal build
38+ - xvfb-run ghc --version
39+ - xvfb-run cabal --version
36 - xvfb-run cabal test
40 - xvfb-run cabal test
37 - cabal clean
41 - cabal clean
38 - cabal install --only-dependencies -f-gtk3 --enable-tests --force-reinstalls
42 - cabal install --only-dependencies -f-gtk3 --enable-tests --force-reinstalls
src/Language/Javascript/JSaddle/Evaluate.hs+1−1
@@ -54,7 +54,7 @@ import Language.Javascript.JSaddle.Monad (JSM)
54-- specify a source URL and starting line number for beter error information.
54-- specify a source URL and starting line number for beter error information.
55--
55--
56-- >>> testJSaddle $ (evaluateScript "\n\n{" global "FileName" 53 >>= valToText) `catch` \(JSException e) -> array (e,e!"sourceURL", e!"line") >>= valToText
56-- >>> testJSaddle $ (evaluateScript "\n\n{" global "FileName" 53 >>= valToText) `catch` \(JSException e) -> array (e,e!"sourceURL", e!"line") >>= valToText
57−-- SyntaxError: Unexpected end of script,FileName,55
57+-- SyntaxError: ...,FileName,55
58evaluateScript :: (ToJSString script, MakeObject this, ToJSString url)
58evaluateScript :: (ToJSString script, MakeObject this, ToJSString url)
59 => script -- ^ JavaScript to evaluate
59 => script -- ^ JavaScript to evaluate
60 -> this
60 -> this
src/Language/Javascript/JSaddle/Object.hs+2−2
@@ -284,7 +284,7 @@ js5 name a0 a1 a2 a3 a4 = jsf name (a0, a1, a2, a3, a4)
284-- <BLANKLINE>
284-- <BLANKLINE>
285-- undefined
285-- undefined
286-- >>> testJSaddle $ do w <- jsg "console"; w ^. js1 "log" "Hello World"
286-- >>> testJSaddle $ do w <- jsg "console"; w ^. js1 "log" "Hello World"
287−-- ** Message: console message: [native code] @0: Hello World
287+-- ** Message: console message: ... @0: Hello World
288-- <BLANKLINE>
288-- <BLANKLINE>
289-- undefined
289-- undefined
290jsg :: ToJSString a => a -> JSM JSVal
290jsg :: ToJSString a => a -> JSM JSVal
@@ -308,7 +308,7 @@ jsgf name = global # name
308-- > jsg0 name = jsgf name ()
308-- > jsg0 name = jsgf name ()
309--
309--
310-- >>> testJSaddle $ jsg0 "globalFunc"
310-- >>> testJSaddle $ jsg0 "globalFunc"
311−-- TypeError: undefined is not an object (evaluating 'x.length')
311+-- TypeError:...undefined...is not an objec...
312jsg0 :: (ToJSString name) => name -> JSM JSVal
312jsg0 :: (ToJSString name) => name -> JSM JSVal
313jsg0 name = jsgf name ()
313jsg0 name = jsgf name ()
314{-# INLINE jsg0 #-}
314{-# INLINE jsg0 #-}
src/Language/Javascript/JSaddle/Value.hs+2−2
@@ -297,9 +297,9 @@ valToJSON indent value = do
297-- May throw JSException.
297-- May throw JSException.
298--
298--
299-- >>> testJSaddle $ (valToObject JSNull >>= valToText) `catch` \ (JSException e) -> valToText e
299-- >>> testJSaddle $ (valToObject JSNull >>= valToText) `catch` \ (JSException e) -> valToText e
300−-- TypeError: null is not an object
300+-- TypeError:...null...is not an object
301-- >>> testJSaddle $ (valToObject () >>= valToText) `catch` \ (JSException e) -> valToText e
301-- >>> testJSaddle $ (valToObject () >>= valToText) `catch` \ (JSException e) -> valToText e
302−-- TypeError: undefined is not an object
302+-- TypeError:...undefined...is not an object
303-- >>> testJSaddle $ valToObject True
303-- >>> testJSaddle $ valToObject True
304-- true
304-- true
305-- >>> testJSaddle $ valToObject False
305-- >>> testJSaddle $ valToObject False