diff --git a/.travis.yml b/.travis.yml index 42320cdf..c99ba3cc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,11 +20,6 @@ after_script: - "bundle exec rakep" - "test $TEST_SUITE = \"ember\" && travis-artifacts upload --target-path assets/$TRAVIS_BRANCH --path public/scripts:scripts --path public/styles:styles" -matrix: - allow_failures: - - env: "TEST_SUITE=ember" - rvm: "1.9.3" - notifications: irc: "irc.freenode.org#travis" campfire: diff --git a/assets/scripts/spec/job_spec.coffee b/assets/scripts/spec/job_spec.coffee index 4b4c5f88..336c73c6 100644 --- a/assets/scripts/spec/job_spec.coffee +++ b/assets/scripts/spec/job_spec.coffee @@ -38,7 +38,7 @@ describe 'on the "job" state', -> build: { href: '/travis-ci/travis-core/builds/1' } job: { href: '/travis-ci/travis-core/jobs/1', active: true } - waits 10 + waits 30 runs -> displaysLog [ 'log 1'