Skip to content

Commit

Permalink
avoid gem compatibility issues for Cucumber and Launchy by using Omni…
Browse files Browse the repository at this point in the history
…Auth from GitHub
  • Loading branch information
DanielKehoe committed Sep 1, 2011
1 parent 2791fb2 commit 411224a
Showing 1 changed file with 4 additions and 7 deletions.
11 changes: 4 additions & 7 deletions rails3-mongoid-omniauth-template.rb
Original file line number Diff line number Diff line change
Expand Up @@ -367,14 +367,10 @@ def before_config(&block); @before_configs[@current_recipe] = block; end
gem 'launchy', '0.4.0', :group => :test
else
# for Rails 3.1+, use optimistic versioning for gems
# avoid gem compatibility issues with OmniAuth by using an older 'cucumber-rails'
# gem 'cucumber-rails', '>= 1.0.2', :group => :test
gem 'cucumber-rails', '>= 1.0.1', :group => :test
gem 'cucumber-rails', '>= 1.0.2', :group => :test
gem 'capybara', '>= 1.0.1', :group => :test
gem 'database_cleaner', '>= 0.6.7', :group => :test
# avoid gem compatibility issues with OmniAuth by using an older 'launchy'
# gem 'launchy', '>= 2.0.5', :group => :test
gem 'launchy', '>= 0.4.0', :group => :test
gem 'launchy', '>= 2.0.5', :group => :test
end
else
recipes.delete('cucumber')
Expand Down Expand Up @@ -609,7 +605,8 @@ def before_config(&block); @before_configs[@current_recipe] = block; end
gem 'omniauth', '0.2.6'
else
# for Rails 3.1+, use optimistic versioning for gems
gem 'omniauth', '>= 0.2.6'
# avoid gem compatibility issues for Cucumber and Launchy by using OmniAuth from GitHub
gem 'omniauth', '>= 0.2.6', :git => "git://github.com/intridea/omniauth.git"
end
else
recipes.delete('omniauth')
Expand Down

0 comments on commit 411224a

Please sign in to comment.