Permalink
Browse files

exclude debugger with conditional in Gemfile, and stop using Gemfile.…

…ci on travis since versions are not synced to Gemfile.lock.
  • Loading branch information...
1 parent 29ce848 commit adea8e4155808dc1a1d37ddcd5a21545fb6b6fd2 @shioyama shioyama committed Jul 8, 2012
Showing with 3 additions and 13 deletions.
  1. +2 −3 .travis.yml
  2. +1 −1 Gemfile
  3. +0 −9 Gemfile.ci
View
@@ -4,13 +4,12 @@ before_script:
- "sh -e /etc/init.d/xvfb start"
- mysql -e 'create database cojiro_test;'
script: "bundle exec rake travis"
-gemfile:
- - Gemfile.ci
rvm:
- 1.9.2
- 1.9.3
env:
- - RAILS_ENV=test
+ - CI=true
+bundler_args: --without development
branches:
only:
- develop
View
@@ -45,7 +45,7 @@ group :test, :development do
gem 'capybara-webkit', :git => 'https://github.com/thoughtbot/capybara-webkit.git'
gem 'jasmine'
gem 'jasminerice'
- gem 'debugger'
+ gem 'debugger' unless ENV['CI']
gem 'rake'
gem 'timecop'
end
View
@@ -1,9 +0,0 @@
-# ref: http://madebynathan.com/2011/12/13/testing-multiple-databases-for-a-rails-app-on-travis-ci/
-
-def gem(*args)
- # Override 'gem' method to block gems not needed by travis-ci in 'real' Gemfile
- super unless %w(debugger).include?(args.first)
-end
-
-# Eval Gemfile
-eval(IO.read(File.join(File.dirname(__FILE__), 'Gemfile')), binding)

0 comments on commit adea8e4

Please sign in to comment.