diff --git a/Gemfile b/Gemfile index 1ec2c114a..acd6d52c6 100644 --- a/Gemfile +++ b/Gemfile @@ -210,7 +210,7 @@ group :development, :test do gem "rspec-rails", '2.13.2' # Cucumber (integration tests) - gem 'cucumber-rails', '1.3.1', :require => false + gem 'cucumber-rails', '1.4.0', :require => false # Jasmine (client side application tests (JS)) gem 'jasmine', '1.3.2' diff --git a/Gemfile.lock b/Gemfile.lock index ef5f3b27d..b422175c5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -79,24 +79,24 @@ GEM connection_pool (1.2.0) crack (0.4.0) safe_yaml (~> 0.9.0) - cucumber (1.3.5) + cucumber (1.3.10) builder (>= 2.1.2) diff-lcs (>= 1.1.3) - gherkin (~> 2.12.0) - multi_json (~> 1.7.5) + gherkin (~> 2.12) + multi_json (>= 1.7.5, < 2.0) multi_test (>= 0.0.2) - cucumber-rails (1.3.1) + cucumber-rails (1.4.0) capybara (>= 1.1.2) cucumber (>= 1.2.0) nokogiri (>= 1.5.0) - rails (~> 3.0) + rails (>= 3.0.0) database_cleaner (1.1.0) devise (3.0.2) bcrypt-ruby (~> 3.0) orm_adapter (~> 0.1) railties (>= 3.2.6, < 5) warden (~> 1.2.3) - diff-lcs (1.2.4) + diff-lcs (1.2.5) entypo-rails (2.0.2) railties (>= 3.1, <= 5) erubis (2.7.0) @@ -142,7 +142,7 @@ GEM rspec-instafail (~> 0.2.0) ruby-progressbar (~> 1.0) galetahub-simple_captcha (0.1.5) - gherkin (2.12.0) + gherkin (2.12.2) multi_json (~> 1.3) gon (4.1.1) actionpack (>= 2.3.0) @@ -219,8 +219,8 @@ GEM mobile-fu (1.2.2) rack-mobile-detect rails - multi_json (1.7.9) - multi_test (0.0.2) + multi_json (1.8.2) + multi_test (0.0.3) multipart-post (1.2.0) mysql2 (0.3.14) nested_form (0.3.2) @@ -439,7 +439,7 @@ DEPENDENCIES client_side_validations (= 3.2.6) compass-rails (= 1.0.3) configurate (= 0.0.8) - cucumber-rails (= 1.3.1) + cucumber-rails (= 1.4.0) database_cleaner (= 1.1.0) devise (= 3.0.2) entypo-rails