Download as
Browse Code »

Commit 9a9e5f01bb252dbffc175749ad04a222f30023f0

Authored by Rafael Manzo
1 parent 6fe1f78b
Exists in colab and in 4 other branches master, spb-master, spb-stable, stable

Cucumber updated

Showing 2 changed files with 7 additions and 5 deletions   Show diff stats
Gemfile
  Diff comments   View file @9a9e5f0
... ... @@ -83,7 +83,7 @@ end
83 83 group :cucumber do
84 84 gem 'cucumber-rails', '~> 1.4.0'
85 85 #Fixed the cumcumber version since the version 1.3.4 causes tests failure
86   - gem 'cucumber', '1.3.2'
  86 + gem 'cucumber', '~> 1.3.10'
87 87 gem 'database_cleaner'
88 88 gem 'poltergeist', '~> 1.4.0'
89 89 end
... ...
Gemfile.lock
  Diff comments   View file @9a9e5f0
... ... @@ -59,11 +59,12 @@ GEM
59 59 simplecov (>= 0.7)
60 60 term-ansicolor
61 61 thor
62   - cucumber (1.3.2)
  62 + cucumber (1.3.10)
63 63 builder (>= 2.1.2)
64 64 diff-lcs (>= 1.1.3)
65   - gherkin (~> 2.12.0)
66   - multi_json (~> 1.3)
  65 + gherkin (~> 2.12)
  66 + multi_json (>= 1.7.5, < 2.0)
  67 + multi_test (>= 0.0.2)
67 68 cucumber-rails (1.4.0)
68 69 capybara (>= 1.1.2)
69 70 cucumber (>= 1.2.0)
... ... @@ -124,6 +125,7 @@ GEM
124 125 metaclass (~> 0.0.1)
125 126 modernizr-rails (2.6.3)
126 127 multi_json (1.8.2)
  128 + multi_test (0.0.2)
127 129 net-scp (1.1.2)
128 130 net-ssh (>= 2.6.5)
129 131 net-sftp (2.1.2)
... ... @@ -252,7 +254,7 @@ DEPENDENCIES
252 254 capistrano (~> 2.15.5)
253 255 coffee-rails (~> 4.0.0)
254 256 coveralls
255   - cucumber (= 1.3.2)
  257 + cucumber (~> 1.3.10)
256 258 cucumber-rails (~> 1.4.0)
257 259 database_cleaner
258 260 devise (~> 3.2.0)
... ...