dcbc28e · jsaddle · git.iko.soy

git.iko.soy/jsaddle

Fixes for travis (support for different webkitgtk)

commitdcbc28e5187e4043ca3e927a6ddb8fd0af4e21cb authorHamish Mackenzie <Hamish.K.Mackenzie@googlemail.com> dateTue 29 Mar 2016, 04:44 (11 years ago) parentbad6de7

4 files changed+9−5

compare with master

unifiedsplit

.travis.yml+4 src/Language/Javascript/JSaddle/Evaluate.hs+1−1 src/Language/Javascript/JSaddle/Object.hs+2−2 src/Language/Javascript/JSaddle/Value.hs+2−2

.travis.yml+4

@@ -28,11 +28,15 @@ install:

2828 - cabal update

2929 - cabal install Cabal cabal-install

3030 - cabal install gtk2hs-buildtools

31+ - ghc --version

32+ - cabal --version

3133

3234script:

3335 - cabal install --only-dependencies --enable-tests --force-reinstalls

3436 - cabal configure --enable-tests

3537 - cabal build

38+ - xvfb-run ghc --version

39+ - xvfb-run cabal --version

3640 - xvfb-run cabal test

3741 - cabal clean

3842 - 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)

5454-- specify a source URL and starting line number for beter error information.

5555--

5656-- >>> 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

5858evaluateScript :: (ToJSString script, MakeObject this, ToJSString url)

5959 => script -- ^ JavaScript to evaluate

6060 -> 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)

284284-- <BLANKLINE>

285285-- undefined

286286-- >>> 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

288288-- <BLANKLINE>

289289-- undefined

290290jsg :: ToJSString a => a -> JSM JSVal

@@ -308,7 +308,7 @@ jsgf name = global # name

308308-- > jsg0 name = jsgf name ()

309309--

310310-- >>> testJSaddle $ jsg0 "globalFunc"

311−-- TypeError: undefined is not an object (evaluating 'x.length')

311+-- TypeError:...undefined...is not an objec...

312312jsg0 :: (ToJSString name) => name -> JSM JSVal

313313jsg0 name = jsgf name ()

314314{-# INLINE jsg0 #-}

src/Language/Javascript/JSaddle/Value.hs+2−2

@@ -297,9 +297,9 @@ valToJSON indent value = do

297297-- May throw JSException.

298298--

299299-- >>> testJSaddle $ (valToObject JSNull >>= valToText) `catch` \ (JSException e) -> valToText e

300−-- TypeError: null is not an object

300+-- TypeError:...null...is not an object

301301-- >>> testJSaddle $ (valToObject () >>= valToText) `catch` \ (JSException e) -> valToText e

302−-- TypeError: undefined is not an object

302+-- TypeError:...undefined...is not an object

303303-- >>> testJSaddle $ valToObject True

304304-- true

305305-- >>> testJSaddle $ valToObject False