Specs are now all running, 190 failures.

This commit is contained in:
Mario Visic 2011-11-26 16:33:57 +11:00
parent fa138b28d0
commit 9f1ce08136
5 changed files with 16 additions and 14 deletions

1
.gitignore vendored
View File

@ -36,6 +36,7 @@ doc/bushido
*.swp *.swp
.sass-cache/ .sass-cache/
spec/dummy/tmp/ spec/dummy/tmp/
spec/dummy/spec/tmp
spec/dummy/log/*.log spec/dummy/log/*.log
app/assets/javascripts/old/ app/assets/javascripts/old/
app/assets/stylesheets/old/ app/assets/stylesheets/old/

View File

@ -50,8 +50,6 @@ gem 'delayed_job', '~> 2.1.1'
gem 'delayed_job_mongoid', '~> 1.0.4' gem 'delayed_job_mongoid', '~> 1.0.4'
gem 'SystemTimer', :platforms => :ruby_18 gem 'SystemTimer', :platforms => :ruby_18
# The rest of the dependencies are for use when in the locomotive dev environment # The rest of the dependencies are for use when in the locomotive dev environment
group :development do group :development do

View File

@ -1,8 +1,9 @@
require 'spec_helper' require 'spec_helper'
describe Admin::GlobalActionsCell do describe Locomotive::GlobalActionsCell do
# FIXME: This does not seem to work correctly, rspec-cells should allow this to be called
render_views # as if it were a controller.
# render_views
let(:menu) { render_cell('admin/global_actions', :show, :current_locomotive_account => FactoryGirl.build('admin user'), :current_site_url => 'http://www.yahoo.fr') } let(:menu) { render_cell('admin/global_actions', :show, :current_locomotive_account => FactoryGirl.build('admin user'), :current_site_url => 'http://www.yahoo.fr') }
@ -86,4 +87,4 @@ describe Admin::GlobalActionsCell do
CellsResetter.clean! CellsResetter.clean!
end end
end end

View File

@ -1,8 +1,9 @@
require 'spec_helper' require 'spec_helper'
describe Admin::MainMenuCell do describe Locomotive::MainMenuCell do
# FIXME: This does not seem to work correctly, rspec-cells should allow this to be called
render_views # as if it were a controller.
# render_views
let(:menu) { render_cell('admin/main_menu', :show) } let(:menu) { render_cell('admin/main_menu', :show) }
@ -82,4 +83,4 @@ describe Admin::MainMenuCell do
CellsResetter.clean! CellsResetter.clean!
end end
end end

View File

@ -1,8 +1,9 @@
require 'spec_helper' require 'spec_helper'
describe Admin::SettingsMenuCell do describe Locomotive::SettingsMenuCell do
# FIXME: This does not seem to work correctly, rspec-cells should allow this to be called
render_views # as if it were a controller.
# render_views
let(:menu) { render_cell('admin/settings_menu', :show) } let(:menu) { render_cell('admin/settings_menu', :show) }
@ -86,4 +87,4 @@ describe Admin::SettingsMenuCell do
CellsResetter.clean! CellsResetter.clean!
end end
end end