git.iko.soy/jsaddle
on master help sign in
Run tests in xvfb
bad6de7Hamish Mackenzie
.travis.yml+8−8
compare with master
unifiedsplit
@@ -5,17 +5,17 @@ sudo: false
5matrix:
5matrix:
6 include:
6 include:
7 - env: CABALVER=1.20 GHCVER=7.8.3
7 - env: CABALVER=1.20 GHCVER=7.8.3
8− addons: {apt: {packages: [cabal-install-1.18,ghc-7.8.3,happy-1.19.5,alex-3.1.4,libwebkitgtk-dev,libwebkitgtk-3.0-dev], sources: [hvr-ghc]}}
8+ addons: {apt: {packages: [cabal-install-1.18,ghc-7.8.3,happy-1.19.5,alex-3.1.4,libwebkitgtk-dev,libwebkitgtk-3.0-dev, xvfb], sources: [hvr-ghc]}}
9 - env: CABALVER=1.20 GHCVER=7.8.4
9 - env: CABALVER=1.20 GHCVER=7.8.4
10− addons: {apt: {packages: [cabal-install-1.18,ghc-7.8.4,happy-1.19.5,alex-3.1.4,libwebkitgtk-dev,libwebkitgtk-3.0-dev], sources: [hvr-ghc]}}
10+ addons: {apt: {packages: [cabal-install-1.18,ghc-7.8.4,happy-1.19.5,alex-3.1.4,libwebkitgtk-dev,libwebkitgtk-3.0-dev, xvfb], sources: [hvr-ghc]}}
11 - env: CABALVER=1.22 GHCVER=7.10.1
11 - env: CABALVER=1.22 GHCVER=7.10.1
12− addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.1,happy-1.19.5,alex-3.1.4,libwebkitgtk-dev,libwebkitgtk-3.0-dev], sources: [hvr-ghc]}}
12+ addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.1,happy-1.19.5,alex-3.1.4,libwebkitgtk-dev,libwebkitgtk-3.0-dev, xvfb], sources: [hvr-ghc]}}
13 - env: CABALVER=1.22 GHCVER=7.10.2
13 - env: CABALVER=1.22 GHCVER=7.10.2
14− addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.2,happy-1.19.5,alex-3.1.4,libwebkitgtk-dev,libwebkitgtk-3.0-dev], sources: [hvr-ghc]}}
14+ addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.2,happy-1.19.5,alex-3.1.4,libwebkitgtk-dev,libwebkitgtk-3.0-dev, xvfb], sources: [hvr-ghc]}}
15 - env: CABALVER=1.22 GHCVER=7.10.3
15 - env: CABALVER=1.22 GHCVER=7.10.3
16− addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.3,happy-1.19.5,alex-3.1.4,libwebkitgtk-dev,libwebkitgtk-3.0-dev], sources: [hvr-ghc]}}
16+ addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.3,happy-1.19.5,alex-3.1.4,libwebkitgtk-dev,libwebkitgtk-3.0-dev, xvfb], sources: [hvr-ghc]}}
17 - env: CABALVER=head GHCVER=head
17 - env: CABALVER=head GHCVER=head
18− addons: {apt: {packages: [cabal-install-head,ghc-head,happy-1.19.5,alex-3.1.4,libwebkitgtk-dev,libwebkitgtk-3.0-dev], sources: [hvr-ghc]}}
18+ addons: {apt: {packages: [cabal-install-head,ghc-head,happy-1.19.5,alex-3.1.4,libwebkitgtk-dev,libwebkitgtk-3.0-dev, xvfb], sources: [hvr-ghc]}}
19 allow_failures:
19 allow_failures:
20 - env: CABALVER=head GHCVER=head
20 - env: CABALVER=head GHCVER=head
21
21
@@ -33,12 +33,12 @@ script:
33 - cabal install --only-dependencies --enable-tests --force-reinstalls
33 - cabal install --only-dependencies --enable-tests --force-reinstalls
34 - cabal configure --enable-tests
34 - cabal configure --enable-tests
35 - cabal build
35 - cabal build
36− - cabal test
36+ - xvfb-run cabal test
37 - cabal clean
37 - cabal clean
38 - cabal install --only-dependencies -f-gtk3 --enable-tests --force-reinstalls
38 - cabal install --only-dependencies -f-gtk3 --enable-tests --force-reinstalls
39 - cabal configure -f-gtk3 --enable-tests
39 - cabal configure -f-gtk3 --enable-tests
40 - cabal build
40 - cabal build
41− - cabal test
41+ - xvfb-run cabal test
42 - cabal clean
42 - cabal clean
43 - cabal sdist
43 - cabal sdist
44
44
src/Language/Javascript/JSaddle/Object.hs+1−1
@@ -420,7 +420,7 @@ infixr 1 <##
420-- JavaScript type (like Date) then this function will fail.
420-- JavaScript type (like Date) then this function will fail.
421--
421--
422-- >>> testJSaddle $ new (jsg "Date") (2013, 1, 1)
422-- >>> testJSaddle $ new (jsg "Date") (2013, 1, 1)
423−-- Fri Feb 01 2013 00:00:00 GMT+1300 (NZDT)
423+-- Fri Feb 01 2013 00:00:00 GMT+... (...)
424new :: (MakeObject constructor, MakeArgs args)
424new :: (MakeObject constructor, MakeArgs args)
425 => constructor
425 => constructor
426 -> args
426 -> args