Next step in upgrading Tracks to Rails 2.2. Some highlights:

* Ran rake rails:update
* Added old actionwebservice framework
* Updated RSpec and RSpec-Rails
* Removed asset_packager plugin (not compatible, Scott no longer maintaining), and replaced with bundle_fu. See the bundle_fu README for more info.
* Hacks to UJS and ARTS plugins, which are no longer supported. Probably should move off both UJS and RJS.
* Hack to flashobject_helper plugin (upgrade to Rails 2.2-compatible version if/when it comes out.)
* Hack to skinny-spec plugin, for Rails 2.2 compatibility. Should check for official release.
* Hacks to resource_feeder plugin, for Rails 2.2 compatibility. Should check for official release (not likely) or move off it.
* Addressed some deprecation warnings. More to come.
* My mobile mime type hackery is no longer necessary with new Rails features. Yay!
* Updated environment.rb.tmpl with changes

TODO:
* Restore view specs marked pending
* Fix failing integration tests.
* Try selenium tests.
* Investigate OpenID support.
* Address deprecation warnings.
* Consider moving parts of environment.rb to initializers
* Address annoying config.gem warning about highline gem
This commit is contained in:
Luke Melia 2008-11-29 12:00:06 -05:00
parent 6d11ebd1b0
commit 35ae5fc431
394 changed files with 15184 additions and 9936 deletions

View file

@ -3,44 +3,44 @@ require 'spec/mocks/errors'
describe ActionView::Base, "with RSpec extensions:", :type => :view do
describe "expect_render" do
describe "should_receive(:render)" do
it "should not raise when render has been received" do
template.expect_render(:partial => "name")
template.should_receive(:render).with(:partial => "name")
template.render :partial => "name"
end
it "should raise when render has NOT been received" do
template.expect_render(:partial => "name")
template.should_receive(:render).with(:partial => "name")
lambda {
template.verify_rendered
}.should raise_error
end
it "should return something (like a normal mock)" do
template.expect_render(:partial => "name").and_return("Little Johnny")
template.should_receive(:render).with(:partial => "name").and_return("Little Johnny")
result = template.render :partial => "name"
result.should == "Little Johnny"
end
end
describe "stub_render" do
describe "stub!(:render)" do
it "should not raise when stubbing and render has been received" do
template.stub_render(:partial => "name")
template.stub!(:render).with(:partial => "name")
template.render :partial => "name"
end
it "should not raise when stubbing and render has NOT been received" do
template.stub_render(:partial => "name")
template.stub!(:render).with(:partial => "name")
end
it "should not raise when stubbing and render has been received with different options" do
template.stub_render(:partial => "name")
template.stub!(:render).with(:partial => "name")
template.render :partial => "view_spec/spacer"
end
it "should not raise when stubbing and expecting and render has been received" do
template.stub_render(:partial => "name")
template.expect_render(:partial => "name")
template.stub!(:render).with(:partial => "name")
template.should_receive(:render).with(:partial => "name")
template.render(:partial => "name")
end
end