From 29157d69f867496f2566fd24e0a5b53d48d8f32c Mon Sep 17 00:00:00 2001 From: Joshua Clayton Date: Fri, 6 Apr 2012 15:47:41 -0400 Subject: [PATCH] Update Cucumber --- Gemfile.lock | 12 +-- factory_girl.gemspec | 2 +- .../step_definitions/factory_girl_steps.rb | 6 +- gemfiles/3.0.gemfile.lock | 93 ++++++++++--------- gemfiles/3.1.gemfile.lock | 90 +++++++++--------- gemfiles/3.2.gemfile.lock | 74 +++++++-------- 6 files changed, 135 insertions(+), 142 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 39d754d4d..bb4330129 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -38,18 +38,18 @@ GEM builder (3.0.0) childprocess (0.2.2) ffi (~> 1.0.6) - cucumber (1.0.6) + cucumber (1.1.9) builder (>= 2.1.2) diff-lcs (>= 1.1.2) - gherkin (~> 2.4.18) + gherkin (~> 2.9.0) json (>= 1.4.6) term-ansicolor (>= 1.0.6) diff-lcs (1.1.3) ffi (1.0.9) - gherkin (2.4.21) + gherkin (2.9.3) json (>= 1.4.6) i18n (0.6.0) - json (1.6.1) + json (1.6.6) mocha (0.9.8) rake multi_json (1.0.3) @@ -71,7 +71,7 @@ GEM sqlite3 (1.3.4) sqlite3-ruby (1.3.3) sqlite3 (>= 1.3.3) - term-ansicolor (1.0.6) + term-ansicolor (1.0.7) timecop (0.3.5) tzinfo (0.3.29) yard (0.7.2) @@ -85,7 +85,7 @@ DEPENDENCIES aruba bluecloth bourne - cucumber (~> 1.0.0) + cucumber (~> 1.1) factory_girl! mocha rspec (~> 2.0) diff --git a/factory_girl.gemspec b/factory_girl.gemspec index 0279db558..ea01d6a3e 100644 --- a/factory_girl.gemspec +++ b/factory_girl.gemspec @@ -24,7 +24,7 @@ Gem::Specification.new do |s| s.add_dependency("activesupport", ">= 3.0.0") s.add_development_dependency("rspec", "~> 2.0") - s.add_development_dependency("cucumber", "~> 1.0.0") + s.add_development_dependency("cucumber", "~> 1.1") s.add_development_dependency("timecop") s.add_development_dependency("simplecov") s.add_development_dependency("aruba") diff --git a/features/step_definitions/factory_girl_steps.rb b/features/step_definitions/factory_girl_steps.rb index 5da599b15..96d10975c 100644 --- a/features/step_definitions/factory_girl_steps.rb +++ b/features/step_definitions/factory_girl_steps.rb @@ -12,7 +12,7 @@ def append_file_to_factory_girl_definitions_path(path_to_file) append_file_to_factory_girl_definitions_path(new_factory_file) - When %{I find definitions} + step %{I find definitions} end When /^"([^"]*)" is added to Factory Girl's file definitions path as an absolute path$/ do |file_name| @@ -20,7 +20,7 @@ def append_file_to_factory_girl_definitions_path(path_to_file) append_file_to_factory_girl_definitions_path(new_factory_file) - When %{I find definitions} + step %{I find definitions} end When /^I create a "([^"]*)" instance from Factory Girl$/ do |factory_name| @@ -31,7 +31,7 @@ def append_file_to_factory_girl_definitions_path(path_to_file) headers = table.headers + ["admin"] rows = table.rows.map { |row| row + [true] } new_table = Cucumber::Ast::Table.new([headers] + rows) - Given %{the following person exists:}, new_table + step %{the following person exists:}, new_table end When /^I find definitions$/ do diff --git a/gemfiles/3.0.gemfile.lock b/gemfiles/3.0.gemfile.lock index 54d15b866..930e90543 100644 --- a/gemfiles/3.0.gemfile.lock +++ b/gemfiles/3.0.gemfile.lock @@ -7,65 +7,68 @@ PATH GEM remote: http://rubygems.org/ specs: - activemodel (3.0.9) - activesupport (= 3.0.9) - builder (~> 2.1.2) - i18n (~> 0.5.0) - activerecord (3.0.9) - activemodel (= 3.0.9) - activesupport (= 3.0.9) - arel (~> 2.0.10) - tzinfo (~> 0.3.23) - activesupport (3.0.9) + activemodel (3.2.3) + activesupport (= 3.2.3) + builder (~> 3.0.0) + activerecord (3.2.3) + activemodel (= 3.2.3) + activesupport (= 3.2.3) + arel (~> 3.0.2) + tzinfo (~> 0.3.29) + activesupport (3.2.3) + i18n (~> 0.6) + multi_json (~> 1.0) appraisal (0.3.8) bundler rake - arel (2.0.10) - aruba (0.3.7) - childprocess (>= 0.1.9) - cucumber (>= 0.10.5) - rspec (>= 2.6.0) - bluecloth (2.1.0) - bourne (1.0) - mocha (= 0.9.8) - builder (2.1.2) - childprocess (0.1.9) + arel (3.0.2) + aruba (0.4.11) + childprocess (>= 0.2.3) + cucumber (>= 1.1.1) + ffi (>= 1.0.11) + rspec (>= 2.7.0) + bluecloth (2.2.0) + bourne (1.1.2) + mocha (= 0.10.5) + builder (3.0.0) + childprocess (0.3.1) ffi (~> 1.0.6) - cucumber (1.0.0) + cucumber (1.1.9) builder (>= 2.1.2) diff-lcs (>= 1.1.2) - gherkin (~> 2.4.1) + gherkin (~> 2.9.0) json (>= 1.4.6) - term-ansicolor (>= 1.0.5) - diff-lcs (1.1.2) - ffi (1.0.9) - gherkin (2.4.1) + term-ansicolor (>= 1.0.6) + diff-lcs (1.1.3) + ffi (1.0.11) + gherkin (2.9.3) json (>= 1.4.6) - i18n (0.5.0) - json (1.5.3) - mocha (0.9.8) - rake - multi_json (1.1.0) - rake (0.9.2) - rspec (2.6.0) - rspec-core (~> 2.6.0) - rspec-expectations (~> 2.6.0) - rspec-mocks (~> 2.6.0) - rspec-core (2.6.4) - rspec-expectations (2.6.0) - diff-lcs (~> 1.1.2) - rspec-mocks (2.6.0) + i18n (0.6.0) + json (1.6.6) + metaclass (0.0.1) + mocha (0.10.5) + metaclass (~> 0.0.1) + multi_json (1.2.0) + rake (0.9.2.2) + rspec (2.9.0) + rspec-core (~> 2.9.0) + rspec-expectations (~> 2.9.0) + rspec-mocks (~> 2.9.0) + rspec-core (2.9.0) + rspec-expectations (2.9.1) + diff-lcs (~> 1.1.3) + rspec-mocks (2.9.0) simplecov (0.6.1) multi_json (~> 1.0) simplecov-html (~> 0.5.3) simplecov-html (0.5.3) - sqlite3 (1.3.3) + sqlite3 (1.3.5) sqlite3-ruby (1.3.3) sqlite3 (>= 1.3.3) - term-ansicolor (1.0.5) + term-ansicolor (1.0.7) timecop (0.3.5) - tzinfo (0.3.28) - yard (0.7.2) + tzinfo (0.3.32) + yard (0.7.5) PLATFORMS ruby @@ -76,7 +79,7 @@ DEPENDENCIES aruba bluecloth bourne - cucumber (~> 1.0.0) + cucumber (~> 1.1) factory_girl! mocha rspec (~> 2.0) diff --git a/gemfiles/3.1.gemfile.lock b/gemfiles/3.1.gemfile.lock index 6c02e4ad0..37e6ddc48 100644 --- a/gemfiles/3.1.gemfile.lock +++ b/gemfiles/3.1.gemfile.lock @@ -7,74 +7,68 @@ PATH GEM remote: http://rubygems.org/ specs: - activemodel (3.1.0) - activesupport (= 3.1.0) - bcrypt-ruby (~> 3.0.0) + activemodel (3.2.3) + activesupport (= 3.2.3) builder (~> 3.0.0) - i18n (~> 0.6) - activerecord (3.1.0) - activemodel (= 3.1.0) - activesupport (= 3.1.0) - arel (~> 2.2.1) + activerecord (3.2.3) + activemodel (= 3.2.3) + activesupport (= 3.2.3) + arel (~> 3.0.2) tzinfo (~> 0.3.29) - activesupport (3.1.0) + activesupport (3.2.3) + i18n (~> 0.6) multi_json (~> 1.0) appraisal (0.3.8) bundler rake - arel (2.2.1) - aruba (0.4.5) - bcat (>= 0.6.1) - childprocess (>= 0.1.9) - cucumber (>= 0.10.7) - rdiscount (>= 1.6.8) - rspec (>= 2.6.0) - bcat (0.6.1) - rack (~> 1.0) - bcrypt-ruby (3.0.0) - bluecloth (2.1.0) - bourne (1.0) - mocha (= 0.9.8) + arel (3.0.2) + aruba (0.4.11) + childprocess (>= 0.2.3) + cucumber (>= 1.1.1) + ffi (>= 1.0.11) + rspec (>= 2.7.0) + bluecloth (2.2.0) + bourne (1.1.2) + mocha (= 0.10.5) builder (3.0.0) - childprocess (0.2.1) + childprocess (0.3.1) ffi (~> 1.0.6) - cucumber (1.0.2) + cucumber (1.1.9) builder (>= 2.1.2) diff-lcs (>= 1.1.2) - gherkin (~> 2.4.5) + gherkin (~> 2.9.0) json (>= 1.4.6) - term-ansicolor (>= 1.0.5) + term-ansicolor (>= 1.0.6) diff-lcs (1.1.3) - ffi (1.0.9) - gherkin (2.4.16) + ffi (1.0.11) + gherkin (2.9.3) json (>= 1.4.6) i18n (0.6.0) - json (1.5.4) - mocha (0.9.8) - rake - multi_json (1.0.3) - rack (1.3.2) - rake (0.9.2) - rdiscount (1.6.8) - rspec (2.6.0) - rspec-core (~> 2.6.0) - rspec-expectations (~> 2.6.0) - rspec-mocks (~> 2.6.0) - rspec-core (2.6.4) - rspec-expectations (2.6.0) - diff-lcs (~> 1.1.2) - rspec-mocks (2.6.0) + json (1.6.6) + metaclass (0.0.1) + mocha (0.10.5) + metaclass (~> 0.0.1) + multi_json (1.2.0) + rake (0.9.2.2) + rspec (2.9.0) + rspec-core (~> 2.9.0) + rspec-expectations (~> 2.9.0) + rspec-mocks (~> 2.9.0) + rspec-core (2.9.0) + rspec-expectations (2.9.1) + diff-lcs (~> 1.1.3) + rspec-mocks (2.9.0) simplecov (0.6.1) multi_json (~> 1.0) simplecov-html (~> 0.5.3) simplecov-html (0.5.3) - sqlite3 (1.3.4) + sqlite3 (1.3.5) sqlite3-ruby (1.3.3) sqlite3 (>= 1.3.3) - term-ansicolor (1.0.6) + term-ansicolor (1.0.7) timecop (0.3.5) - tzinfo (0.3.29) - yard (0.7.2) + tzinfo (0.3.32) + yard (0.7.5) PLATFORMS ruby @@ -85,7 +79,7 @@ DEPENDENCIES aruba bluecloth bourne - cucumber (~> 1.0.0) + cucumber (~> 1.1) factory_girl! mocha rspec (~> 2.0) diff --git a/gemfiles/3.2.gemfile.lock b/gemfiles/3.2.gemfile.lock index b76abcdde..e5d44b73c 100644 --- a/gemfiles/3.2.gemfile.lock +++ b/gemfiles/3.2.gemfile.lock @@ -7,61 +7,57 @@ PATH GEM remote: http://rubygems.org/ specs: - activemodel (3.2.0) - activesupport (= 3.2.0) + activemodel (3.2.3) + activesupport (= 3.2.3) builder (~> 3.0.0) - activerecord (3.2.0) - activemodel (= 3.2.0) - activesupport (= 3.2.0) - arel (~> 3.0.0) + activerecord (3.2.3) + activemodel (= 3.2.3) + activesupport (= 3.2.3) + arel (~> 3.0.2) tzinfo (~> 0.3.29) - activesupport (3.2.0) + activesupport (3.2.3) i18n (~> 0.6) multi_json (~> 1.0) appraisal (0.3.8) bundler rake - arel (3.0.0) - aruba (0.4.6) - bcat (>= 0.6.1) - childprocess (>= 0.2.0) - cucumber (>= 1.0.2) - rdiscount (>= 1.6.8) - rspec (>= 2.6.0) - bcat (0.6.2) - rack (~> 1.0) + arel (3.0.2) + aruba (0.4.11) + childprocess (>= 0.2.3) + cucumber (>= 1.1.1) + ffi (>= 1.0.11) + rspec (>= 2.7.0) bluecloth (2.2.0) - bourne (1.0) - mocha (= 0.9.8) + bourne (1.1.2) + mocha (= 0.10.5) builder (3.0.0) - childprocess (0.3.0) + childprocess (0.3.1) ffi (~> 1.0.6) - cucumber (1.0.6) + cucumber (1.1.9) builder (>= 2.1.2) diff-lcs (>= 1.1.2) - gherkin (~> 2.4.18) + gherkin (~> 2.9.0) json (>= 1.4.6) term-ansicolor (>= 1.0.6) diff-lcs (1.1.3) ffi (1.0.11) - gherkin (2.4.21) + gherkin (2.9.3) json (>= 1.4.6) i18n (0.6.0) - json (1.6.5) - mocha (0.9.8) - rake - multi_json (1.0.4) - rack (1.4.0) + json (1.6.6) + metaclass (0.0.1) + mocha (0.10.5) + metaclass (~> 0.0.1) + multi_json (1.2.0) rake (0.9.2.2) - rdiscount (1.6.8) - rspec (2.8.0) - rspec-core (~> 2.8.0) - rspec-expectations (~> 2.8.0) - rspec-mocks (~> 2.8.0) - rspec-core (2.8.0) - rspec-expectations (2.8.0) - diff-lcs (~> 1.1.2) - rspec-mocks (2.8.0) + rspec (2.9.0) + rspec-core (~> 2.9.0) + rspec-expectations (~> 2.9.0) + rspec-mocks (~> 2.9.0) + rspec-core (2.9.0) + rspec-expectations (2.9.1) + diff-lcs (~> 1.1.3) + rspec-mocks (2.9.0) simplecov (0.6.1) multi_json (~> 1.0) simplecov-html (~> 0.5.3) @@ -71,8 +67,8 @@ GEM sqlite3 (>= 1.3.3) term-ansicolor (1.0.7) timecop (0.3.5) - tzinfo (0.3.31) - yard (0.7.4) + tzinfo (0.3.32) + yard (0.7.5) PLATFORMS ruby @@ -83,7 +79,7 @@ DEPENDENCIES aruba bluecloth bourne - cucumber (~> 1.0.0) + cucumber (~> 1.1) factory_girl! mocha rspec (~> 2.0)