Skip to content

Commit d7d1ec5

Browse files
committed
collision of steak and cuke was solved.
1 parent 4dbda1c commit d7d1ec5

File tree

3 files changed

+15
-13
lines changed

3 files changed

+15
-13
lines changed

Gemfile

+5-2
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@ group :development do
3030
gem 'thin'
3131
end
3232

33+
group :test do
34+
gem 'steak'
35+
gem 'capybara'
36+
end
37+
3338
group :test, :cucumber do
3439
gem 'rspec-rails'
3540
gem 'rr'
@@ -44,6 +49,4 @@ group :test, :cucumber do
4449
gem 'moro-miso'
4550
gem 'database_cleaner'
4651
gem 'nokogiri'
47-
gem 'steak'
48-
gem 'capybara'
4952
end

Gemfile.lock

+9-11
Original file line numberDiff line numberDiff line change
@@ -108,15 +108,14 @@ dependencies:
108108
- :test
109109
- :cucumber
110110
version: ">= 0"
111-
gettext:
112-
group:
113-
- :development
114-
version: < 2
115111
steak:
116112
group:
117113
- :test
118-
- :cucumber
119114
version: ">= 0"
115+
gettext:
116+
group:
117+
- :development
118+
version: < 2
120119
moro-miso:
121120
group:
122121
- :test
@@ -146,11 +145,6 @@ dependencies:
146145
version: = 0.0.2
147146
require: []
148147

149-
capybara:
150-
group:
151-
- :test
152-
- :cucumber
153-
version: ">= 0"
154148
nokogiri:
155149
group:
156150
- :test
@@ -166,6 +160,10 @@ dependencies:
166160
version: ">= 0"
167161
require: []
168162

163+
capybara:
164+
group:
165+
- :test
166+
version: ">= 0"
169167
autotest-rails:
170168
group:
171169
- :test
@@ -321,7 +319,7 @@ specs:
321319
version: 0.4.2
322320
- will_paginate:
323321
version: 2.3.12
324-
hash: cb0d85a8bdcdcd2e795907e19ad558bdade7759c
322+
hash: f5ad355f37e31a23a947aba05e89112d4af3902d
325323
sources:
326324
- Git:
327325
uri: git://github.com/amatsuda/i18n_generators.git

features/support/env.rb

+1
Original file line numberDiff line numberDiff line change
@@ -58,4 +58,5 @@
5858
end
5959

6060
Before do
61+
RubyKaigi.create(:year => 2010, :capacity => 900, :party_capacity => 310)
6162
end

0 commit comments

Comments
 (0)