diff --git a/Gemfile b/Gemfile index d411a88e..141cc0ac 100644 --- a/Gemfile +++ b/Gemfile @@ -9,9 +9,9 @@ gem 'sqlite3' # Gems used only for assets and not required # in production environments by default. group :assets do - gem 'sass-rails' - gem 'coffee-rails' - gem 'uglifier' + gem 'sass-rails', "~> 3.2.5" + gem 'uglifier', "~> 1.3.0" + gem 'sprockets-rails', '~> 0.0.1' end gemspec diff --git a/features/step_definitions/generator_steps.rb b/features/step_definitions/generator_steps.rb index 94338a21..b1736aee 100644 --- a/features/step_definitions/generator_steps.rb +++ b/features/step_definitions/generator_steps.rb @@ -10,10 +10,6 @@ step %{I run `bundle install --local`} end -Then /^the file "([^"]*)" should contain:$/ do |file, partial_content| - check_file_content(file, partial_content, true) -end - Then /^should have the migration "([^"]*)"$/ do |migration| in_current_dir do Dir["db/migrate/*_#{migration}"].length.should == 1 diff --git a/mercury-rails.gemspec b/mercury-rails.gemspec index 0cc19b2f..534d0c16 100644 --- a/mercury-rails.gemspec +++ b/mercury-rails.gemspec @@ -17,21 +17,15 @@ Gem::Specification.new do |s| # Runtime Dependencies s.add_dependency 'railties', '~> 3.2' - s.add_dependency 'coffee-rails' + s.add_dependency 'coffee-rails', '~> 3.2.2' # Development Dependencies - s.add_development_dependency 'sprockets', '~> 2.1' - s.add_development_dependency 'sprockets-rails', '~> 0.0.1' - s.add_development_dependency 'uglifier' - - # Testing dependencies - s.add_development_dependency 'rspec-core', '>= 2.8.0' - s.add_development_dependency 'evergreen', '>= 1.0.0' - s.add_development_dependency 'selenium-webdriver', '>= 2.20.0' + s.add_development_dependency 'rspec-core', '~> 2.12.0' + s.add_development_dependency 'evergreen', '~> 1.0.0' + s.add_development_dependency 'selenium-webdriver', '~> 2.26.0' s.add_development_dependency 'cucumber-rails', '~> 1.3.0' - s.add_development_dependency 'capybara', '~> 1.1.2' - s.add_development_dependency 'capybara-firebug', '~> 1.1.0' - s.add_development_dependency 'aruba' + s.add_development_dependency 'capybara-firebug', '~> 1.2.3' + s.add_development_dependency 'aruba', '~> 0.5.1' s.add_development_dependency 'database_cleaner' # Gem Files