From f055e6813df1dcfb73d41df55dd26e035678f3e1 Mon Sep 17 00:00:00 2001 From: yqbk Date: Sun, 16 Oct 2016 17:21:54 +0200 Subject: [PATCH] changes in travis --- .travis.yml | 11 ++++++++++- lib/docker_client.rb | 4 ++-- spec/features/editor_spec.rb | 3 ++- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 08922270..b965f2d6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,17 @@ +sudo: required + +services: + - docker + # https://docs.travis-ci.com/user/docker/ + addons: code_climate: repo_token: 53a2c2608c848714e96f6a1fc0365dcfdfec051f7827d50cea965ea625f49734 + before_install: - export DISPLAY=:99.0 - sh -e /etc/init.d/xvfb start + before_script: - cp .rspec.travis .rspec - cp config/action_mailer.yml.travis config/action_mailer.yml @@ -12,6 +20,7 @@ before_script: - cp config/secrets.yml.travis config/secrets.yml - psql --command='CREATE DATABASE travis_ci_test;' --username=postgres - bundle exec rake db:schema:load RAILS_ENV=test + cache: bundler language: ruby rvm: @@ -24,5 +33,5 @@ rvm: # - 2.1.5 # - 2.2.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 diff --git a/lib/docker_client.rb b/lib/docker_client.rb index 3639bd6d..ba51980f 100644 --- a/lib/docker_client.rb +++ b/lib/docker_client.rb @@ -334,8 +334,8 @@ class DockerClient @execution_environment = options[:execution_environment] # 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. - @image = self.class.find_image_by_tag(@execution_environment.docker_image) - fail(Error, "Cannot find image #{@execution_environment.docker_image}!") unless @image + # @image = self.class.find_image_by_tag(@execution_environment.docker_image) + # fail(Error, "Cannot find image #{@execution_environment.docker_image}!") unless @image end def self.initialize_environment diff --git a/spec/features/editor_spec.rb b/spec/features/editor_spec.rb index be8e89d4..269a34b7 100644 --- a/spec/features/editor_spec.rb +++ b/spec/features/editor_spec.rb @@ -13,6 +13,7 @@ describe 'Editor', js: true do end it 'displays the exercise title' do + # pending("no exercise title set") expect(page).to have_content(exercise.title) end @@ -91,7 +92,7 @@ describe 'Editor', js: true do before(:each) { click_link(I18n.t('exercises.implement.progress')) } 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') end end