Permalink
Browse files

collision of steak and cuke was solved.

  • Loading branch information...
ursm committed May 12, 2010
1 parent 4dbda1c commit d7d1ec56393d4ce0b229d47886eaf6ba8336997a
Showing with 15 additions and 13 deletions.
  1. +5 −2 Gemfile
  2. +9 −11 Gemfile.lock
  3. +1 −0 features/support/env.rb
View
@@ -30,6 +30,11 @@ group :development do
gem 'thin'
end
+group :test do
+ gem 'steak'
+ gem 'capybara'
+end
+
group :test, :cucumber do
gem 'rspec-rails'
gem 'rr'
@@ -44,6 +49,4 @@ group :test, :cucumber do
gem 'moro-miso'
gem 'database_cleaner'
gem 'nokogiri'
- gem 'steak'
- gem 'capybara'
end
View
@@ -108,15 +108,14 @@ dependencies:
- :test
- :cucumber
version: ">= 0"
- gettext:
- group:
- - :development
- version: < 2
steak:
group:
- :test
- - :cucumber
version: ">= 0"
+ gettext:
+ group:
+ - :development
+ version: < 2
moro-miso:
group:
- :test
@@ -146,11 +145,6 @@ dependencies:
version: = 0.0.2
require: []
- capybara:
- group:
- - :test
- - :cucumber
- version: ">= 0"
nokogiri:
group:
- :test
@@ -166,6 +160,10 @@ dependencies:
version: ">= 0"
require: []
+ capybara:
+ group:
+ - :test
+ version: ">= 0"
autotest-rails:
group:
- :test
@@ -321,7 +319,7 @@ specs:
version: 0.4.2
- will_paginate:
version: 2.3.12
-hash: cb0d85a8bdcdcd2e795907e19ad558bdade7759c
+hash: f5ad355f37e31a23a947aba05e89112d4af3902d
sources:
- Git:
uri: git://github.com/amatsuda/i18n_generators.git
View
@@ -58,4 +58,5 @@
end
Before do
+ RubyKaigi.create(:year => 2010, :capacity => 900, :party_capacity => 310)
end

0 comments on commit d7d1ec5

Please sign in to comment.