changes in travis

This commit is contained in:
yqbk
2016-10-16 17:21:54 +02:00
parent 043ece68f4
commit f055e6813d
3 changed files with 14 additions and 4 deletions

View File

@ -1,9 +1,17 @@
sudo: required
services:
- docker
# https://docs.travis-ci.com/user/docker/
addons: addons:
code_climate: code_climate:
repo_token: 53a2c2608c848714e96f6a1fc0365dcfdfec051f7827d50cea965ea625f49734 repo_token: 53a2c2608c848714e96f6a1fc0365dcfdfec051f7827d50cea965ea625f49734
before_install: before_install:
- export DISPLAY=:99.0 - export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start - sh -e /etc/init.d/xvfb start
before_script: before_script:
- cp .rspec.travis .rspec - cp .rspec.travis .rspec
- cp config/action_mailer.yml.travis config/action_mailer.yml - cp config/action_mailer.yml.travis config/action_mailer.yml
@ -12,6 +20,7 @@ before_script:
- cp config/secrets.yml.travis config/secrets.yml - cp config/secrets.yml.travis config/secrets.yml
- psql --command='CREATE DATABASE travis_ci_test;' --username=postgres - psql --command='CREATE DATABASE travis_ci_test;' --username=postgres
- bundle exec rake db:schema:load RAILS_ENV=test - bundle exec rake db:schema:load RAILS_ENV=test
cache: bundler cache: bundler
language: ruby language: ruby
rvm: rvm:
@ -24,5 +33,5 @@ rvm:
# - 2.1.5 # - 2.1.5
# - 2.2.1 # - 2.2.1
- 2.3.1 - 2.3.1
script: bundle exec rspec --color --format documentation --require spec_helper --require rails_helper script: bundle exec rspec --color --format documentation --require spec_helper --require rails_helper --tag ~docker

View File

@ -334,8 +334,8 @@ class DockerClient
@execution_environment = options[:execution_environment] @execution_environment = options[:execution_environment]
# todo: eventually re-enable this if it is cached. But in the end, we do not need this. # todo: eventually re-enable this if it is cached. But in the end, we do not need this.
# docker daemon got much too much load. all not 100% necessary calls to the daemon were removed. # docker daemon got much too much load. all not 100% necessary calls to the daemon were removed.
@image = self.class.find_image_by_tag(@execution_environment.docker_image) # @image = self.class.find_image_by_tag(@execution_environment.docker_image)
fail(Error, "Cannot find image #{@execution_environment.docker_image}!") unless @image # fail(Error, "Cannot find image #{@execution_environment.docker_image}!") unless @image
end end
def self.initialize_environment def self.initialize_environment

View File

@ -13,6 +13,7 @@ describe 'Editor', js: true do
end end
it 'displays the exercise title' do it 'displays the exercise title' do
# pending("no exercise title set")
expect(page).to have_content(exercise.title) expect(page).to have_content(exercise.title)
end end
@ -91,7 +92,7 @@ describe 'Editor', js: true do
before(:each) { click_link(I18n.t('exercises.implement.progress')) } before(:each) { click_link(I18n.t('exercises.implement.progress')) }
it 'does not contains a button for submitting the exercise' do it 'does not contains a button for submitting the exercise' do
# the button is only displayed when an correct LTI handshake to a running course happened. This is not the case in the test # pending("the button is only displayed when an correct LTI handshake to a running course happened. This is not the case in the test")
expect(page).not_to have_css('#submit') expect(page).not_to have_css('#submit')
end end
end end