github-migration/engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix tests suite with ruby 1.9.2

Browse Source
This commit is contained in:
did 2012-01-07 02:49:23 +01:00
parent dc24c1b184
commit a1e692a34d
6 changed files with 35 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Gemfile
View File

@ -60,16 +60,15 @@ group :test, :development do
gem 'ruby-debug19', :platforms => :mri_19
gem 'bushido_stub', '0.0.3'
gem 'cucumber-rails'
end
group :test do
gem 'cucumber-rails', '1.2.0', :require => false
gem 'autotest', :platforms => :mri
gem 'ZenTest', :platforms => :mri
gem 'growl-glue'
gem 'rspec-rails', '2.6.1'
gem 'factory_girl_rails', '~> 1.1'
gem 'factory_girl_rails', '~> 1.3.0'
gem 'pickle'
gem 'xpath', '~> 0.1.4'
gem 'capybara'

65
Gemfile.lock
View File

@ -52,7 +52,7 @@ GEM
rest-client (>= 1.6.1)
bushido_stub (0.0.3)
activesupport (>= 3.0.7)
cancan (1.6.5)
cancan (1.6.7)
capybara (1.1.2)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
@ -65,15 +65,15 @@ GEM
cells (3.7.1)
actionpack (~> 3.0)
railties (~> 3.0)
childprocess (0.2.2)
childprocess (0.2.5)
ffi (~> 1.0.6)
columnize (0.3.4)
columnize (0.3.6)
configuration (1.3.1)
crack (0.1.8)
cucumber (1.1.3)
cucumber (1.1.4)
builder (>= 2.1.2)
diff-lcs (>= 1.1.2)
gherkin (~> 2.6.7)
gherkin (~> 2.7.1)
json (>= 1.4.6)
term-ansicolor (>= 1.0.6)
cucumber-rails (1.2.0)
@ -83,7 +83,7 @@ GEM
custom_fields (1.0.0.beta.25)
activesupport (~> 3.0.9)
mongoid (= 2.0.2)
database_cleaner (0.6.7)
database_cleaner (0.7.0)
delayed_job (3.0.0)
activesupport (~> 3.0)
delayed_job_mongoid (1.0.8)
@ -98,15 +98,15 @@ GEM
devise (>= 1.0.6)
rubycas-client (>= 2.2.1)
diff-lcs (1.1.3)
dragonfly (0.9.8)
dragonfly (0.9.9)
rack
erubis (2.6.6)
abstract (>= 1.0.0)
excon (0.6.6)
factory_girl (2.1.2)
factory_girl (2.2.0)
activesupport
factory_girl_rails (1.2.0)
factory_girl (~> 2.1.0)
factory_girl_rails (1.3.0)
factory_girl (~> 2.2.0)
railties (>= 3.0.0)
ffi (1.0.11)
fog (0.8.2)
@ -123,7 +123,7 @@ GEM
actionpack (>= 2.3.7)
activesupport (>= 2.3.7)
i18n (~> 0.4)
gherkin (2.6.8)
gherkin (2.7.2)
json (>= 1.4.6)
growl-glue (1.0.7)
haml (3.1.2)
@ -132,20 +132,21 @@ GEM
activesupport (>= 2.1.0)
launchy (~> 0.3.2)
rest-client (>= 1.4.0, < 1.7.0)
highline (1.6.2)
highline (1.6.9)
httparty (0.7.8)
crack (= 0.1.8)
i18n (0.5.0)
inherited_resources (1.1.2)
has_scope (~> 0.5.0)
responders (~> 0.6.0)
jammit (0.6.3)
jammit (0.6.5)
yui-compressor (>= 0.9.3)
json (1.6.1)
json_pure (1.6.1)
kaminari (0.12.4)
rails (>= 3.0.0)
kgio (2.6.0)
json (1.6.4)
kaminari (0.13.0)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
railties (>= 3.0.0)
kgio (2.7.0)
launchy (0.3.7)
configuration (>= 0.0.5)
rake (>= 0.8.1)
@ -174,14 +175,15 @@ GEM
activemodel (~> 3.0)
mongo (~> 1.3)
tzinfo (~> 0.3.22)
net-ssh (2.2.1)
multi_json (1.0.4)
net-ssh (2.2.2)
nokogiri (1.5.0)
open4 (1.1.0)
open4 (1.3.0)
orm_adapter (0.0.5)
pickle (0.4.10)
cucumber (>= 0.8)
rake
polyglot (0.3.2)
polyglot (0.3.3)
proxies (0.2.1)
rack (1.2.5)
rack-cache (1.1)
@ -204,7 +206,7 @@ GEM
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.4)
raindrops (0.7.0)
raindrops (0.8.0)
rake (0.9.2)
rdoc (3.12)
json (~> 1.4)
@ -216,8 +218,7 @@ GEM
rspec-core (~> 2.6.0)
rspec-expectations (~> 2.6.0)
rspec-mocks (~> 2.6.0)
rspec-cells (0.0.5)
cells (~> 3.4)
rspec-cells (0.1.0)
rails (~> 3.0)
rspec-rails (~> 2.2)
rspec-core (2.6.4)
@ -245,18 +246,18 @@ GEM
ruby-hmac (0.4.0)
ruby_core_source (0.1.5)
archive-tar-minitar (>= 0.5.2)
rubycas-client (2.2.1)
rubycas-client (2.3.8)
activesupport
rubyzip (0.9.5)
s3 (0.3.8)
s3 (0.3.11)
proxies (~> 0.2.0)
sanitize (2.0.3)
nokogiri (>= 1.4.4, < 1.6)
sass (3.1.2)
selenium-webdriver (2.13.0)
childprocess (>= 0.2.1)
selenium-webdriver (2.16.0)
childprocess (>= 0.2.5)
ffi (~> 1.0.9)
json_pure
multi_json (~> 1.0.4)
rubyzip
spork (0.9.0.rc9)
term-ansicolor (1.0.7)
@ -269,7 +270,7 @@ GEM
kgio (~> 2.4)
rack
raindrops (~> 0.6)
warden (1.0.5)
warden (1.0.6)
rack (>= 1.0)
xpath (0.1.4)
nokogiri (~> 1.3)
@ -293,14 +294,14 @@ DEPENDENCIES
capybara
carrierwave (= 0.5.6)
cells (~> 3.7.0)
cucumber-rails
cucumber-rails (= 1.2.0)
custom_fields (= 1.0.0.beta.25)
database_cleaner
delayed_job_mongoid (= 1.0.8)
devise (= 1.3.4)
devise_bushido_authenticatable (= 1.0.0.alpha10)
dragonfly (~> 0.9.1)
factory_girl_rails (~> 1.1)
factory_girl_rails (~> 1.3.0)
fog (= 0.8.2)
formtastic (~> 1.2.3)
growl-glue

2
features/support/env.rb
View File

@ -6,8 +6,6 @@
ENV['RAILS_ENV'] ||= 'test'
require File.expand_path(File.dirname(__FILE__) + '/../../config/environment')
require 'cucumber/rails'
require 'cucumber/formatter/unicode' # Remove this line if you don't want Cucumber Unicode support
require 'cucumber/rails/rspec'

2
spec/cells/admin/global_actions_spec.rb
View File

@ -2,8 +2,6 @@ require 'spec_helper'
describe Admin::GlobalActionsCell do
render_views
let(:menu) { render_cell('admin/global_actions', :show, :current_admin => FactoryGirl.build('admin user'), :current_site_url => 'http://www.yahoo.fr') }
describe 'show menu' do

2
spec/cells/admin/main_menu_cell_spec.rb
View File

@ -2,8 +2,6 @@ require 'spec_helper'
describe Admin::MainMenuCell do
render_views
let(:menu) { render_cell('admin/main_menu', :show) }
describe 'show menu' do

2
spec/cells/admin/settings_menu_cell_spec.rb
View File

@ -2,8 +2,6 @@ require 'spec_helper'
describe Admin::SettingsMenuCell do
render_views
let(:menu) { render_cell('admin/settings_menu', :show) }
describe 'show menu' do