Permalink
Browse files

Use the main Gemfile also for travis

  • Loading branch information...
1 parent 88e60f3 commit 495fd83dd8f367d7d2cff9b32ef66c789d95d1df nomadcoder committed Nov 14, 2012
Showing with 1 addition and 15 deletions.
  1. +1 −1 .travis.yml
  2. +0 −1 netzke-core.gemspec
  3. +0 −13 test/core_test_app/gemfiles/rails3_2.gemfile
View
@@ -3,7 +3,7 @@ rvm:
- 1.9.2
- 1.9.3
gemfile:
- - test/core_test_app/gemfiles/rails3_2.gemfile
+ - test/core_test_app/Gemfile
before_script:
- chmod 777 ./config/ci/before-travis.sh
- ./config/ci/before-travis.sh
View
@@ -200,7 +200,6 @@ Gem::Specification.new do |s|
"test/core_test_app/features/step_definitions/web_steps.rb",
"test/core_test_app/features/support/env.rb",
"test/core_test_app/features/support/paths.rb",
- "test/core_test_app/gemfiles/rails3_2.gemfile",
"test/core_test_app/lib/tasks/.gitkeep",
"test/core_test_app/public/404.html",
"test/core_test_app/public/422.html",
@@ -1,13 +0,0 @@
-source 'http://rubygems.org'
-
-gem 'rails', '~>3.2.0'
-
-gem 'sqlite3'
-
-group :test do
- gem 'capybara'
- gem 'database_cleaner'
- gem 'cucumber-rails', :require => false
- gem 'cucumber'
- gem 'rspec-rails'
-end

0 comments on commit 495fd83

Please sign in to comment.