diff --git a/.travis.yml b/.travis.yml index bb4c4a7924562609b3368277976be16dc729ffdb..8c83097cb3a8a265528b73b3171ef264fcca1c2e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,7 @@ rvm: - 1.9.3 services: - mysql +bundler_args: --without production before_script: - "cp config/database.yml.$DB config/database.yml" - "cp config/gitlab.yml.example config/gitlab.yml" diff --git a/Gemfile b/Gemfile index 8e569c5b2e525b07ba78e552352717004371a76a..f173f620766711bf10c39b2e2313bf9157954feb 100644 --- a/Gemfile +++ b/Gemfile @@ -103,36 +103,38 @@ group :assets do gem 'bootstrap-sass', "2.0.4" end -group :development do - gem "letter_opener" - gem "annotate", :git => "https://github.com/ctran/annotate_models.git" - gem 'rack-mini-profiler' -end - group :development, :test do gem 'spinach-rails' gem "rspec-rails" gem "capybara" gem "capybara-webkit" gem "headless" - gem "pry" - gem "awesome_print" gem "database_cleaner" - gem "launchy" gem 'factory_girl_rails' - # Guard - gem 'guard-rspec' - gem 'guard-spinach' - - # Notification - gem 'rb-fsevent', :require => darwin_only('rb-fsevent') - gem 'growl', :require => darwin_only('growl') - gem 'rb-inotify', :require => linux_only('rb-inotify') + # These gems are non-essential to development/testing and can be excluded on Travis + unless ENV['CI'] + gem "letter_opener" + gem "annotate", :git => "https://github.com/ctran/annotate_models.git" + gem 'rack-mini-profiler' + + gem "pry" + gem "awesome_print" + gem "launchy" + gem "simplecov", :require => false + + # Guard + gem 'guard-rspec' + gem 'guard-spinach' + + # Notification + gem 'rb-fsevent', :require => darwin_only('rb-fsevent') + gem 'growl', :require => darwin_only('growl') + gem 'rb-inotify', :require => linux_only('rb-inotify') + end end group :test do - gem "simplecov", :require => false gem "shoulda-matchers" gem 'email_spec' gem 'resque_spec'