diff --git a/Gemfile.lock b/Gemfile.lock index f9e64b445..ed4889f2a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -49,10 +49,10 @@ GEM childprocess (0.2.2) ffi (~> 1.0.6) cocaine (0.2.0) - cucumber (1.0.6) + cucumber (1.1.4) builder (>= 2.1.2) diff-lcs (>= 1.1.2) - gherkin (~> 2.4.18) + gherkin (~> 2.7.1) json (>= 1.4.6) term-ansicolor (>= 1.0.6) diff-lcs (1.1.3) @@ -70,13 +70,13 @@ GEM nokogiri (~> 1.5.0) ruby-hmac formatador (0.2.1) - gherkin (2.4.21) + gherkin (2.7.1) json (>= 1.4.6) httparty (0.8.1) multi_json multi_xml i18n (0.6.0) - json (1.6.1) + json (1.6.3) json_pure (1.6.1) metaclass (0.0.1) mime-types (1.16) @@ -110,7 +110,7 @@ GEM rubyzip shoulda (2.11.3) sqlite3 (1.3.4) - term-ansicolor (1.0.6) + term-ansicolor (1.0.7) tzinfo (0.3.31) uuidtools (2.1.2) xpath (0.1.4) @@ -126,7 +126,7 @@ DEPENDENCIES bundler capybara cocaine (~> 0.2) - cucumber (~> 1.0.0) + cucumber (~> 1.1.0) fakeweb fog jruby-openssl diff --git a/features/step_definitions/rails_steps.rb b/features/step_definitions/rails_steps.rb index a1af826c3..25eaa18b2 100644 --- a/features/step_definitions/rails_steps.rb +++ b/features/step_definitions/rails_steps.rb @@ -19,15 +19,15 @@ end Given /^I run a rails generator to generate a "([^"]*)" scaffold with "([^"]*)"$/ do |model_name, attributes| - Given %[I successfully run `bundle exec #{generator_command} scaffold #{model_name} #{attributes}`] + step %[I successfully run `bundle exec #{generator_command} scaffold #{model_name} #{attributes}`] end Given /^I run a paperclip generator to add a paperclip "([^"]*)" to the "([^"]*)" model$/ do |attachment_name, model_name| - Given %[I successfully run `bundle exec #{generator_command} paperclip #{model_name} #{attachment_name}`] + step %[I successfully run `bundle exec #{generator_command} paperclip #{model_name} #{attachment_name}`] end Given /^I run a migration$/ do - Given %[I successfully run `bundle exec rake db:migrate`] + step %[I successfully run `bundle exec rake db:migrate`] end Given /^I update my new user view to include the file upload field$/ do diff --git a/features/step_definitions/s3_steps.rb b/features/step_definitions/s3_steps.rb index a8e034861..71340cc50 100644 --- a/features/step_definitions/s3_steps.rb +++ b/features/step_definitions/s3_steps.rb @@ -6,7 +6,7 @@ "([^\/\.]+)" end FakeWeb.register_uri(:put, Regexp.new(path), :body => "OK") - When "I attach the file \"#{file_path}\" to \"#{field}\"" + step "I attach the file \"#{file_path}\" to \"#{field}\"" end Then /^the file at "([^"]*)" should be uploaded to S3$/ do |url| diff --git a/paperclip.gemspec b/paperclip.gemspec index 4006a2fc8..990f291e8 100644 --- a/paperclip.gemspec +++ b/paperclip.gemspec @@ -30,7 +30,7 @@ Gem::Specification.new do |s| s.add_development_dependency('mocha') s.add_development_dependency('aws-sdk') s.add_development_dependency('sqlite3', '~> 1.3.4') - s.add_development_dependency('cucumber', '~> 1.0.0') + s.add_development_dependency('cucumber', '~> 1.1.0') s.add_development_dependency('aruba') s.add_development_dependency('capybara') s.add_development_dependency('bundler')