You are viewing a plain text version of this content. The canonical link for it is here.
Posted to olio-commits@incubator.apache.org by ws...@apache.org on 2008/12/11 01:34:30 UTC
svn commit: r725524 [4/14] - in /incubator/olio/webapp/rails/trunk:
app/controllers/ app/models/ app/views/events/ config/ config/environments/
spec/controllers/ spec/models/ vendor/plugins/attachment_fu/
vendor/plugins/attachment_fu/lib/ vendor/plugin...
Added: incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/rails/matchers/render_template_spec.rb
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/rails/matchers/render_template_spec.rb?rev=725524&view=auto
==============================================================================
--- incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/rails/matchers/render_template_spec.rb (added)
+++ incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/rails/matchers/render_template_spec.rb Wed Dec 10 17:34:18 2008
@@ -0,0 +1,176 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+['isolation','integration'].each do |mode|
+ describe "response.should render_template (in #{mode} mode)",
+ :type => :controller do
+ controller_name :render_spec
+ if mode == 'integration'
+ integrate_views
+ end
+
+ it "should match a simple path" do
+ post 'some_action'
+ response.should render_template('some_action')
+ end
+
+ it "should match a less simple path" do
+ post 'some_action'
+ response.should render_template('render_spec/some_action')
+ end
+
+ it "should match a less simple path to another controller" do
+ post 'action_which_renders_template_from_other_controller'
+ response.should render_template('controller_spec/action_with_template')
+ end
+
+ it "should match a symbol" do
+ post 'some_action'
+ response.should render_template(:some_action)
+ end
+
+ it "should match an rjs template" do
+ xhr :post, 'some_action'
+ if Rails::VERSION::STRING < "2.0.0"
+ response.should render_template('render_spec/some_action.rjs')
+ else
+ response.should render_template('render_spec/some_action')
+ end
+ end
+
+ it "should match a partial template (simple path)" do
+ get 'action_with_partial'
+ response.should render_template("_a_partial")
+ end
+
+ it "should match a partial template (complex path)" do
+ get 'action_with_partial'
+ response.should render_template("render_spec/_a_partial")
+ end
+
+ it "should fail when the wrong template is rendered" do
+ post 'some_action'
+ lambda do
+ response.should render_template('non_existent_template')
+ end.should fail_with(/expected \"non_existent_template\", got \"render_spec\/some_action(.rhtml)?\"/)
+ end
+
+ it "should fail without full path when template is associated with a different controller" do
+ post 'action_which_renders_template_from_other_controller'
+ lambda do
+ response.should render_template('action_with_template')
+ end.should fail_with(/expected \"action_with_template\", got \"controller_spec\/action_with_template(.rhtml)?\"/)
+ end
+
+ it "should fail with incorrect full path when template is associated with a different controller" do
+ post 'action_which_renders_template_from_other_controller'
+ lambda do
+ response.should render_template('render_spec/action_with_template')
+ end.should fail_with(/expected \"render_spec\/action_with_template\", got \"controller_spec\/action_with_template(\.rhtml)?\"/)
+ end
+
+ it "should fail on the wrong extension (given rhtml)" do
+ get 'some_action'
+ lambda {
+ response.should render_template('render_spec/some_action.rjs')
+ }.should fail_with(/expected \"render_spec\/some_action\.rjs\", got \"render_spec\/some_action(\.rhtml)?\"/)
+ end
+
+ it "should fail when TEXT is rendered" do
+ post 'text_action'
+ lambda do
+ response.should render_template('some_action')
+ end.should fail_with(/expected \"some_action\", got (nil|\"\")/)
+ end
+
+ describe "with an alternate layout" do
+ it "should say it rendered the action's template" do
+ get 'action_with_alternate_layout'
+ response.should render_template('action_with_alternate_layout')
+ end
+ end
+ end
+
+ describe "response.should_not render_template (in #{mode} mode)",
+ :type => :controller do
+ controller_name :render_spec
+ if mode == 'integration'
+ integrate_views
+ end
+
+ it "should pass when the action renders nothing" do
+ post 'action_that_renders_nothing'
+ response.should_not render_template('action_that_renders_nothing')
+ end
+
+ it "should pass when the action renders nothing (symbol)" do
+ post 'action_that_renders_nothing'
+ response.should_not render_template(:action_that_renders_nothing)
+ end
+
+ it "should pass when the action does not render the template" do
+ post 'some_action'
+ response.should_not render_template('some_other_template')
+ end
+
+ it "should pass when the action does not render the template (symbol)" do
+ post 'some_action'
+ response.should_not render_template(:some_other_template)
+ end
+
+ it "should pass when the action does not render the template (named with controller)" do
+ post 'some_action'
+ response.should_not render_template('render_spec/some_other_template')
+ end
+
+ it "should pass when the action renders the template with a different controller" do
+ post 'action_which_renders_template_from_other_controller'
+ response.should_not render_template('action_with_template')
+ end
+
+ it "should pass when the action renders the template (named with controller) with a different controller" do
+ post 'action_which_renders_template_from_other_controller'
+ response.should_not render_template('render_spec/action_with_template')
+ end
+
+ it "should pass when TEXT is rendered" do
+ post 'text_action'
+ response.should_not render_template('some_action')
+ end
+
+ it "should fail when the action renders the template" do
+ post 'some_action'
+ lambda do
+ response.should_not render_template('some_action')
+ end.should fail_with("expected not to render \"some_action\", but did")
+ end
+
+ it "should fail when the action renders the template (symbol)" do
+ post 'some_action'
+ lambda do
+ response.should_not render_template(:some_action)
+ end.should fail_with("expected not to render \"some_action\", but did")
+ end
+
+ it "should fail when the action renders the template (named with controller)" do
+ post 'some_action'
+ lambda do
+ response.should_not render_template('render_spec/some_action')
+ end.should fail_with("expected not to render \"render_spec/some_action\", but did")
+ end
+
+ it "should fail when the action renders the partial" do
+ post 'action_with_partial'
+ lambda do
+ response.should_not render_template('_a_partial')
+ end.should fail_with("expected not to render \"_a_partial\", but did")
+ end
+
+ it "should fail when the action renders the partial (named with controller)" do
+ post 'action_with_partial'
+ lambda do
+ response.should_not render_template('render_spec/_a_partial')
+ end.should fail_with("expected not to render \"render_spec/_a_partial\", but did")
+ end
+
+ end
+end
Added: incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/rails/matchers/should_change_spec.rb
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/rails/matchers/should_change_spec.rb?rev=725524&view=auto
==============================================================================
--- incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/rails/matchers/should_change_spec.rb (added)
+++ incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/rails/matchers/should_change_spec.rb Wed Dec 10 17:34:18 2008
@@ -0,0 +1,15 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+describe "should change" do
+ describe "handling association proxies" do
+ it "should match expected collection with proxied collection" do
+ person = Person.create!(:name => 'David')
+ koala = person.animals.create!(:name => 'Koala')
+ zebra = person.animals.create!(:name => 'Zebra')
+
+ lambda {
+ person.animals.delete(koala)
+ }.should change{person.animals}.to([zebra])
+ end
+ end
+end
\ No newline at end of file
Modified: incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/rails/mocks/mock_model_spec.rb
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/rails/mocks/mock_model_spec.rb?rev=725524&r1=725523&r2=725524&view=diff
==============================================================================
--- incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/rails/mocks/mock_model_spec.rb (original)
+++ incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/rails/mocks/mock_model_spec.rb Wed Dec 10 17:34:18 2008
@@ -2,63 +2,105 @@
require File.dirname(__FILE__) + '/ar_classes'
describe "mock_model" do
- before(:each) do
- @model = mock_model(SubMockableModel)
+ describe "responding to interrogation" do
+ before(:each) do
+ @model = mock_model(SubMockableModel)
+ end
+ it "should say it is_a? if it is" do
+ @model.is_a?(SubMockableModel).should be(true)
+ end
+ it "should say it is_a? if it's ancestor is" do
+ @model.is_a?(MockableModel).should be(true)
+ end
+ it "should say it is kind_of? if it is" do
+ @model.kind_of?(SubMockableModel).should be(true)
+ end
+ it "should say it is kind_of? if it's ancestor is" do
+ @model.kind_of?(MockableModel).should be(true)
+ end
+ it "should say it is instance_of? if it is" do
+ @model.instance_of?(SubMockableModel).should be(true)
+ end
+ it "should not say it instance_of? if it isn't, even if it's ancestor is" do
+ @model.instance_of?(MockableModel).should be(false)
+ end
end
- it "should say it is_a? if it is" do
- @model.is_a?(SubMockableModel).should be(true)
- end
- it "should say it is_a? if it's ancestor is" do
- @model.is_a?(MockableModel).should be(true)
- end
- it "should say it is kind_of? if it is" do
- @model.kind_of?(SubMockableModel).should be(true)
- end
- it "should say it is kind_of? if it's ancestor is" do
- @model.kind_of?(MockableModel).should be(true)
- end
- it "should say it is instance_of? if it is" do
- @model.instance_of?(SubMockableModel).should be(true)
- end
- it "should not say it instance_of? if it isn't, even if it's ancestor is" do
- @model.instance_of?(MockableModel).should be(false)
- end
-end
-describe "mock_model with stubbed id", :type => :view do
- before(:each) do
- @model = mock_model(MockableModel, :id => 1)
+ describe "with params" do
+ it "should not mutate its parameters" do
+ params = {:a => 'b'}
+ model = mock_model(MockableModel, params)
+ params.should == {:a => 'b'}
+ end
end
- it "should be named using the stubbed id value" do
- @model.instance_variable_get(:@name).should == "MockableModel_1"
+
+ describe "with #id stubbed", :type => :view do
+ before(:each) do
+ @model = mock_model(MockableModel, :id => 1)
+ end
+ it "should be named using the stubbed id value" do
+ @model.instance_variable_get(:@name).should == "MockableModel_1"
+ end
+ it "should return string of id value for to_param" do
+ @model.to_param.should == "1"
+ end
end
-end
-describe "mock_model with null_object", :type => :view do
- before(:each) do
- @model = mock_model(MockableModel, :null_object => true, :mocked_method => "mocked")
- end
-
- it "should be able to mock methods" do
- @model.mocked_method.should == "mocked"
+ describe "as association", :type => :view do
+ before(:each) do
+ @real = AssociatedModel.create!
+ @mock_model = mock_model(MockableModel)
+ @real.mockable_model = @mock_model
+ end
+
+ it "should pass associated_model == mock" do
+ @mock_model.should == @real.mockable_model
+ end
+
+ it "should pass mock == associated_model" do
+ @real.mockable_model.should == @mock_model
+ end
end
- it "should return itself to unmocked methods" do
- @model.unmocked_method.should equal(@model)
+
+ describe "with :null_object => true", :type => :view do
+ before(:each) do
+ @model = mock_model(MockableModel, :null_object => true, :mocked_method => "mocked")
+ end
+
+ it "should be able to mock methods" do
+ @model.mocked_method.should == "mocked"
+ end
+ it "should return itself to unmocked methods" do
+ @model.unmocked_method.should equal(@model)
+ end
end
-end
-describe "mock_model as association", :type => :view do
- before(:each) do
- @real = AssociatedModel.create!
- @mock_model = mock_model(MockableModel)
- @real.mockable_model = @mock_model
- end
-
- it "should pass associated_model == mock" do
- @mock_model.should == @real.mockable_model
+ describe "#as_null_object", :type => :view do
+ before(:each) do
+ @model = mock_model(MockableModel, :mocked_method => "mocked").as_null_object
+ end
+
+ it "should be able to mock methods" do
+ @model.mocked_method.should == "mocked"
+ end
+ it "should return itself to unmocked methods" do
+ @model.unmocked_method.should equal(@model)
+ end
end
- it "should pass mock == associated_model" do
- @real.mockable_model.should == @mock_model
+ describe "#as_new_record" do
+ it "should say it is a new record" do
+ mock_model(MockableModel).as_new_record.should be_new_record
+ end
+
+ it "should have a nil id" do
+ mock_model(MockableModel).as_new_record.id.should be(nil)
+ end
+
+ it "should return nil for #to_param" do
+ mock_model(MockableModel).as_new_record.to_param.should be(nil)
+ end
end
end
+
+
Modified: incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/rails/mocks/stub_model_spec.rb
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/rails/mocks/stub_model_spec.rb?rev=725524&r1=725523&r2=725524&view=diff
==============================================================================
--- incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/rails/mocks/stub_model_spec.rb (original)
+++ incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/rails/mocks/stub_model_spec.rb Wed Dec 10 17:34:18 2008
@@ -51,29 +51,30 @@
second.id.should == (first.id + 1)
end
-end
+ describe "as association" do
+ before(:each) do
+ @real = AssociatedModel.create!
+ @stub_model = stub_model(MockableModel)
+ @real.mockable_model = @stub_model
+ end
-describe "stub_model as association" do
- before(:each) do
- @real = AssociatedModel.create!
- @stub_model = stub_model(MockableModel)
- @real.mockable_model = @stub_model
- end
-
- it "should pass associated_model == mock" do
- @stub_model.should == @real.mockable_model
- end
+ it "should pass associated_model == mock" do
+ @stub_model.should == @real.mockable_model
+ end
- it "should pass mock == associated_model" do
- @real.mockable_model.should == @stub_model
+ it "should pass mock == associated_model" do
+ @real.mockable_model.should == @stub_model
+ end
end
-end
-describe "stub_model with a block" do
- it "should yield the model" do
- model = stub_model(MockableModel) do |block_arg|
- @block_arg = block_arg
+ describe "with a block" do
+ it "should yield the model" do
+ model = stub_model(MockableModel) do |block_arg|
+ @block_arg = block_arg
+ end
+ model.should be(@block_arg)
end
- model.should be(@block_arg)
end
end
+
+
Modified: incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/rails/spec_server_spec.rb
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/rails/spec_server_spec.rb?rev=725524&r1=725523&r2=725524&view=diff
==============================================================================
--- incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/rails/spec_server_spec.rb (original)
+++ incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/rails/spec_server_spec.rb Wed Dec 10 17:34:18 2008
@@ -1,96 +1,96 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-
-describe "script/spec_server file", :shared => true do
- attr_accessor :tmbundle_install_directory
- attr_reader :animals_yml_path, :original_animals_content
-
- before do
- @animals_yml_path = File.expand_path("#{RAILS_ROOT}/spec/fixtures/animals.yml")
- @original_animals_content = File.read(animals_yml_path)
- end
-
- after do
- File.open(animals_yml_path, "w") do |f|
- f.write original_animals_content
- end
- end
-
- after(:each) do
- system "lsof -i tcp:8989 | sed /COMMAND/d | awk '{print $2}' | xargs kill"
- end
-
- it "runs a spec" do
- dir = File.dirname(__FILE__)
- output = ""
- Timeout.timeout(10) do
- loop do
- output = `#{RAILS_ROOT}/script/spec #{dir}/sample_spec.rb --drb 2>&1`
- break unless output.include?("No server is running")
- end
- end
-
- if $?.exitstatus != 0 || output !~ /0 failures/
- flunk "command 'script/spec spec/sample_spec' failed\n#{output}"
- end
-
- fixtures = YAML.load(@original_animals_content)
- fixtures['pig']['name'] = "Piggy"
-
- File.open(animals_yml_path, "w") do |f|
- f.write YAML.dump(fixtures)
- end
-
- Timeout.timeout(10) do
- loop do
- output = `#{RAILS_ROOT}/script/spec #{dir}/sample_modified_fixture.rb --drb 2>&1`
- break unless output.include?("No server is running")
- end
- end
-
- if $?.exitstatus != 0 || output !~ /0 failures/
- flunk "command 'script/spec spec/sample_modified_fixture' failed\n#{output}"
- end
- end
-
- def start_spec_server
- dir = File.dirname(__FILE__)
- Thread.start do
- system "cd #{RAILS_ROOT}; script/spec_server"
- end
-
- file_content = ""
- end
-end
-
-describe "script/spec_server file without TextMate bundle" do
- it_should_behave_like "script/spec_server file"
- before(:each) do
- start_spec_server
- end
-end
-
-describe "script/spec_server file with TextMate bundle" do
- it_should_behave_like "script/spec_server file"
- before(:each) do
- dir = File.dirname(__FILE__)
- @tmbundle_install_directory = File.expand_path("#{Dir.tmpdir}/Library/Application Support/TextMate/Bundles")
- @bundle_name = "RSpec.tmbundle"
- FileUtils.mkdir_p(tmbundle_install_directory)
- bundle_dir = File.expand_path("#{dir}/../../../../../../#{@bundle_name}")
- File.directory?(bundle_dir).should be_true
- unless system(%Q|ln -s #{bundle_dir} "#{tmbundle_install_directory}"|)
- raise "Creating link to Textmate Bundle"
- end
- start_spec_server
- end
-
- after(:each) do
- bundle_file_to_remove = "#{tmbundle_install_directory}/#{@bundle_name}"
- if bundle_file_to_remove == "/"
- raise "bundle file path resolved to '/' - could not call rm"
- end
- unless system(%Q|rm "#{bundle_file_to_remove}"|)
- raise "Removing Textmate bundle link failed"
- end
- end
-end
+# require File.dirname(__FILE__) + '/../spec_helper'
+#
+# describe "script/spec_server file", :shared => true do
+# attr_accessor :tmbundle_install_directory
+# attr_reader :animals_yml_path, :original_animals_content
+#
+# before do
+# @animals_yml_path = File.expand_path("#{RAILS_ROOT}/spec/fixtures/animals.yml")
+# @original_animals_content = File.read(animals_yml_path)
+# end
+#
+# after do
+# File.open(animals_yml_path, "w") do |f|
+# f.write original_animals_content
+# end
+# end
+#
+# after(:each) do
+# system "lsof -i tcp:8989 | sed /COMMAND/d | awk '{print $2}' | xargs kill"
+# end
+#
+# it "runs a spec" do
+# dir = File.dirname(__FILE__)
+# output = ""
+# Timeout.timeout(10) do
+# loop do
+# output = `#{RAILS_ROOT}/script/spec #{dir}/sample_spec.rb --drb 2>&1`
+# break unless output.include?("No server is running")
+# end
+# end
+#
+# if $?.exitstatus != 0 || output !~ /0 failures/
+# flunk "command 'script/spec spec/sample_spec' failed\n#{output}"
+# end
+#
+# fixtures = YAML.load(@original_animals_content)
+# fixtures['pig']['name'] = "Piggy"
+#
+# File.open(animals_yml_path, "w") do |f|
+# f.write YAML.dump(fixtures)
+# end
+#
+# Timeout.timeout(10) do
+# loop do
+# output = `#{RAILS_ROOT}/script/spec #{dir}/sample_modified_fixture.rb --drb 2>&1`
+# break unless output.include?("No server is running")
+# end
+# end
+#
+# if $?.exitstatus != 0 || output !~ /0 failures/
+# flunk "command 'script/spec spec/sample_modified_fixture' failed\n#{output}"
+# end
+# end
+#
+# def start_spec_server
+# dir = File.dirname(__FILE__)
+# Thread.start do
+# system "cd #{RAILS_ROOT}; script/spec_server"
+# end
+#
+# file_content = ""
+# end
+# end
+#
+# describe "script/spec_server file without TextMate bundle" do
+# it_should_behave_like "script/spec_server file"
+# before(:each) do
+# start_spec_server
+# end
+# end
+#
+# describe "script/spec_server file with TextMate bundle" do
+# it_should_behave_like "script/spec_server file"
+# before(:each) do
+# dir = File.dirname(__FILE__)
+# @tmbundle_install_directory = File.expand_path("#{Dir.tmpdir}/Library/Application Support/TextMate/Bundles")
+# @bundle_name = "RSpec.tmbundle"
+# FileUtils.mkdir_p(tmbundle_install_directory)
+# bundle_dir = File.expand_path("#{dir}/../../../../../../#{@bundle_name}")
+# File.directory?(bundle_dir).should be_true
+# unless system(%Q|ln -s #{bundle_dir} "#{tmbundle_install_directory}"|)
+# raise "Creating link to Textmate Bundle"
+# end
+# start_spec_server
+# end
+#
+# after(:each) do
+# bundle_file_to_remove = "#{tmbundle_install_directory}/#{@bundle_name}"
+# if bundle_file_to_remove == "/"
+# raise "bundle file path resolved to '/' - could not call rm"
+# end
+# unless system(%Q|rm "#{bundle_file_to_remove}"|)
+# raise "Removing Textmate bundle link failed"
+# end
+# end
+# end
Added: incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/controllers/action_view_base_spec_controller.rb
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/controllers/action_view_base_spec_controller.rb?rev=725524&view=auto
==============================================================================
--- incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/controllers/action_view_base_spec_controller.rb (added)
+++ incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/controllers/action_view_base_spec_controller.rb Wed Dec 10 17:34:18 2008
@@ -0,0 +1,2 @@
+class ActionViewBaseSpecController < ActionController::Base
+end
Added: incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/controllers/controller_spec_controller.rb
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/controllers/controller_spec_controller.rb?rev=725524&view=auto
==============================================================================
--- incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/controllers/controller_spec_controller.rb (added)
+++ incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/controllers/controller_spec_controller.rb Wed Dec 10 17:34:18 2008
@@ -0,0 +1,99 @@
+class ControllerSpecController < ActionController::Base
+ before_filter :raise_error, :only => :action_with_skipped_before_filter
+
+ def raise_error
+ raise "from a before filter"
+ end
+
+ skip_before_filter :raise_error
+
+ if ['edge','2.0.0'].include?(ENV['RSPEC_RAILS_VERSION'])
+ set_view_path [File.join(File.dirname(__FILE__), "..", "views")]
+ else
+ set_view_path File.join(File.dirname(__FILE__), "..", "views")
+ end
+
+ def some_action
+ render :template => "template/that/does/not/actually/exist"
+ end
+
+ def action_with_template
+ render :template => "controller_spec/action_with_template"
+ end
+
+ def action_which_sets_flash
+ flash[:flash_key] = "flash value"
+ render :text => ""
+ end
+
+ def action_which_gets_session
+ raise "expected #{params[:session_key].inspect}\ngot #{session[:session_key].inspect}" unless (session[:session_key] == params[:expected])
+ render :text => ""
+ end
+
+ def action_which_sets_session
+ session[:session_key] = "session value"
+ end
+
+ def action_which_gets_cookie
+ raise "expected #{params[:expected].inspect}, got #{cookies[:cookie_key].inspect}" unless (cookies[:cookie_key] == params[:expected])
+ render :text => ""
+ end
+
+ def action_which_sets_cookie
+ cookies['cookie_key'] = params[:value]
+ render :text => ""
+ end
+
+ def action_with_partial
+ render :partial => "controller_spec/partial"
+ end
+
+ def action_with_partial_with_object
+ render :partial => "controller_spec/partial", :object => params[:thing]
+ end
+
+ def action_with_partial_with_locals
+ render :partial => "controller_spec/partial", :locals => {:thing => params[:thing]}
+ end
+
+ def action_with_errors_in_template
+ render :template => "controller_spec/action_with_errors_in_template"
+ end
+
+ def action_setting_the_assigns_hash
+ @indirect_assigns_key = :indirect_assigns_key_value
+ end
+
+ def action_setting_flash_after_session_reset
+ reset_session
+ flash[:after_reset] = "available"
+ end
+
+ def action_setting_flash_before_session_reset
+ flash[:before_reset] = 'available'
+ reset_session
+ end
+
+ def action_with_render_update
+ render :update do |page|
+ page.replace :bottom, 'replace_me',
+ :partial => 'non_existent_partial'
+ end
+ end
+
+ def action_with_skipped_before_filter
+ render :text => ""
+ end
+
+ def action_that_assigns_false_to_a_variable
+ @a_variable = false
+ render :text => ""
+ end
+end
+
+class ControllerInheritingFromApplicationControllerController < ApplicationController
+ def action_with_inherited_before_filter
+ render :text => ""
+ end
+end
\ No newline at end of file
Added: incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/controllers/redirect_spec_controller.rb
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/controllers/redirect_spec_controller.rb?rev=725524&view=auto
==============================================================================
--- incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/controllers/redirect_spec_controller.rb (added)
+++ incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/controllers/redirect_spec_controller.rb Wed Dec 10 17:34:18 2008
@@ -0,0 +1,59 @@
+class RedirectSpecController < ApplicationController
+
+ def action_with_no_redirect
+ render :text => "this is just here to keep this from causing a MissingTemplate error"
+ end
+
+ def action_with_redirect_to_somewhere
+ redirect_to :action => 'somewhere'
+ end
+
+ def action_with_redirect_to_other_somewhere
+ redirect_to :controller => 'render_spec', :action => 'text_action'
+ end
+
+ def action_with_redirect_to_somewhere_and_return
+ redirect_to :action => 'somewhere' and return
+ render :text => "this is after the return"
+ end
+
+ def somewhere
+ render :text => "this is just here to keep this from causing a MissingTemplate error"
+ end
+
+ def action_with_redirect_to_rspec_site
+ redirect_to "http://rspec.rubyforge.org"
+ end
+
+ def action_with_redirect_back
+ redirect_to :back
+ end
+
+ def action_with_redirect_in_respond_to
+ respond_to do |wants|
+ wants.html { redirect_to :action => 'somewhere' }
+ end
+ end
+
+ def action_with_redirect_which_creates_query_string
+ redirect_to :action => "somewhere", :id => 1111, :param1 => "value1", :param2 => "value2"
+ end
+
+ # note: sometimes this is the URL which rails will generate from the hash in
+ # action_with_redirect_which_creates_query_string
+ def action_with_redirect_with_query_string_order1
+ redirect_to "http://test.host/redirect_spec/somewhere/1111?param1=value1¶m2=value2"
+ end
+
+ # note: sometimes this is the URL which rails will generate from the hash in
+ # action_with_redirect_which_creates_query_string
+ def action_with_redirect_with_query_string_order2
+ redirect_to "http://test.host/redirect_spec/somewhere/1111?param2=value2¶m1=value1"
+ end
+
+ def action_with_redirect_to_unroutable_url_inside_app
+ redirect_to :controller => "nonexistant", :action => "none"
+ end
+
+end
+
Added: incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/controllers/render_spec_controller.rb
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/controllers/render_spec_controller.rb?rev=725524&view=auto
==============================================================================
--- incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/controllers/render_spec_controller.rb (added)
+++ incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/controllers/render_spec_controller.rb Wed Dec 10 17:34:18 2008
@@ -0,0 +1,30 @@
+class RenderSpecController < ApplicationController
+ set_view_path File.join(File.dirname(__FILE__), "..", "views")
+
+ def some_action
+ respond_to do |format|
+ format.html
+ format.js
+ end
+ end
+
+ def action_which_renders_template_from_other_controller
+ render :template => 'controller_spec/action_with_template'
+ end
+
+ def text_action
+ render :text => "this is the text for this action"
+ end
+
+ def action_with_partial
+ render :partial => "a_partial"
+ end
+
+ def action_that_renders_nothing
+ render :nothing => true
+ end
+
+ def action_with_alternate_layout
+ render :layout => 'simple'
+ end
+end
Added: incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/controllers/rjs_spec_controller.rb
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/controllers/rjs_spec_controller.rb?rev=725524&view=auto
==============================================================================
--- incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/controllers/rjs_spec_controller.rb (added)
+++ incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/controllers/rjs_spec_controller.rb Wed Dec 10 17:34:18 2008
@@ -0,0 +1,58 @@
+class RjsSpecController < ApplicationController
+ set_view_path File.join(File.dirname(__FILE__), "..", "views")
+
+ def replace_html
+ end
+
+ def insert_html
+ end
+
+ def replace
+ end
+
+ def hide_div
+ end
+
+ def hide_page_element
+ end
+
+ def replace_html_with_partial
+ end
+
+ def render_replace_html
+ render :update do |page|
+ page.replace_html 'mydiv', 'replacement text'
+ page.replace_html 'myotherdiv', 'other replacement text'
+ end
+ end
+
+ def render_replace_html_with_partial
+ render :update do |page|
+ page.replace_html 'mydiv', :partial => 'rjs_spec/replacement_partial'
+ end
+ end
+
+ def render_insert_html
+ render :update do |page|
+ page.insert_html 'mydiv', 'replacement text'
+ end
+ end
+
+ def render_replace
+ render :update do |page|
+ page.replace 'mydiv', 'replacement text'
+ end
+ end
+
+ def render_hide_div
+ render :update do |page|
+ page.hide 'mydiv'
+ end
+ end
+
+ def render_hide_page_element
+ render :update do |page|
+ page['mydiv'].hide
+ end
+ end
+end
Added: incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/helpers/addition_helper.rb
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/helpers/addition_helper.rb?rev=725524&view=auto
==============================================================================
--- incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/helpers/addition_helper.rb (added)
+++ incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/helpers/addition_helper.rb Wed Dec 10 17:34:18 2008
@@ -0,0 +1,5 @@
+module AdditionHelper
+ def plus(addend)
+ @addend + addend
+ end
+end
Added: incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/helpers/explicit_helper.rb
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/helpers/explicit_helper.rb?rev=725524&view=auto
==============================================================================
--- incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/helpers/explicit_helper.rb (added)
+++ incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/helpers/explicit_helper.rb Wed Dec 10 17:34:18 2008
@@ -0,0 +1,38 @@
+module ExplicitHelper
+ def method_in_explicit_helper
+ "<div>This is text from a method in the ExplicitHelper</div>"
+ end
+
+ # this is an example of a method spec'able with eval_erb in helper specs
+ def prepend(arg, &block)
+ begin # rails edge after 2.1.0 eliminated need for block.binding
+ concat(arg) + block.call
+ rescue
+ concat(arg, block.binding) + block.call
+ end
+ end
+
+ def named_url
+ rspec_on_rails_specs_url
+ end
+
+ def named_path
+ rspec_on_rails_specs_path
+ end
+
+ def params_foo
+ params[:foo]
+ end
+
+ def session_foo
+ session[:foo]
+ end
+
+ def request_thing
+ request.thing
+ end
+
+ def flash_thing
+ flash[:thing]
+ end
+end
Added: incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/helpers/more_explicit_helper.rb
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/helpers/more_explicit_helper.rb?rev=725524&view=auto
==============================================================================
--- incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/helpers/more_explicit_helper.rb (added)
+++ incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/helpers/more_explicit_helper.rb Wed Dec 10 17:34:18 2008
@@ -0,0 +1,5 @@
+module MoreExplicitHelper
+ def method_in_more_explicit_helper
+ "<div>This is text from a method in the MoreExplicitHelper</div>"
+ end
+end
Added: incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/helpers/plugin_application_helper.rb
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/helpers/plugin_application_helper.rb?rev=725524&view=auto
==============================================================================
--- incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/helpers/plugin_application_helper.rb (added)
+++ incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/helpers/plugin_application_helper.rb Wed Dec 10 17:34:18 2008
@@ -0,0 +1,6 @@
+# Methods added to this helper will be available to all templates in the application.
+module ApplicationHelper
+ def method_in_plugin_application_helper
+ "<div>This is text from a method in the ApplicationHelper</div>"
+ end
+end
Added: incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/helpers/view_spec_helper.rb
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/helpers/view_spec_helper.rb?rev=725524&view=auto
==============================================================================
--- incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/helpers/view_spec_helper.rb (added)
+++ incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/helpers/view_spec_helper.rb Wed Dec 10 17:34:18 2008
@@ -0,0 +1,13 @@
+module ViewSpecHelper
+ def method_in_helper
+ "<div>This is text from a method in the ViewSpecHelper</div>"
+ end
+
+ def method_in_template_with_partial
+ "<div>method_in_template_with_partial in ViewSpecHelper</div>"
+ end
+
+ def method_in_partial
+ "<div>method_in_partial in ViewSpecHelper</div>"
+ end
+end
Added: incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/controller_spec/_partial.rhtml
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/controller_spec/_partial.rhtml?rev=725524&view=auto
==============================================================================
(empty)
Added: incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/controller_spec/action_setting_flash_after_session_reset.rhtml
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/controller_spec/action_setting_flash_after_session_reset.rhtml?rev=725524&view=auto
==============================================================================
--- incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/controller_spec/action_setting_flash_after_session_reset.rhtml (added)
+++ incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/controller_spec/action_setting_flash_after_session_reset.rhtml Wed Dec 10 17:34:18 2008
@@ -0,0 +1 @@
+
Added: incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/controller_spec/action_setting_flash_before_session_reset.rhtml
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/controller_spec/action_setting_flash_before_session_reset.rhtml?rev=725524&view=auto
==============================================================================
--- incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/controller_spec/action_setting_flash_before_session_reset.rhtml (added)
+++ incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/controller_spec/action_setting_flash_before_session_reset.rhtml Wed Dec 10 17:34:18 2008
@@ -0,0 +1 @@
+
Added: incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/controller_spec/action_setting_the_assigns_hash.rhtml
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/controller_spec/action_setting_the_assigns_hash.rhtml?rev=725524&view=auto
==============================================================================
(empty)
Added: incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/controller_spec/action_with_errors_in_template.rhtml
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/controller_spec/action_with_errors_in_template.rhtml?rev=725524&view=auto
==============================================================================
--- incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/controller_spec/action_with_errors_in_template.rhtml (added)
+++ incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/controller_spec/action_with_errors_in_template.rhtml Wed Dec 10 17:34:18 2008
@@ -0,0 +1 @@
+<% raise %>
\ No newline at end of file
Added: incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/controller_spec/action_with_template.rhtml
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/controller_spec/action_with_template.rhtml?rev=725524&view=auto
==============================================================================
--- incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/controller_spec/action_with_template.rhtml (added)
+++ incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/controller_spec/action_with_template.rhtml Wed Dec 10 17:34:18 2008
@@ -0,0 +1 @@
+<div>This is action_with_template.rhtml</div>
Added: incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/layouts/application.rhtml
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/layouts/application.rhtml?rev=725524&view=auto
==============================================================================
(empty)
Added: incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/layouts/simple.rhtml
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/layouts/simple.rhtml?rev=725524&view=auto
==============================================================================
(empty)
Added: incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/objects/_object.html.erb
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/objects/_object.html.erb?rev=725524&view=auto
==============================================================================
--- incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/objects/_object.html.erb (added)
+++ incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/objects/_object.html.erb Wed Dec 10 17:34:18 2008
@@ -0,0 +1 @@
+<%= object.name %>
\ No newline at end of file
Added: incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/render_spec/_a_partial.rhtml
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/render_spec/_a_partial.rhtml?rev=725524&view=auto
==============================================================================
(empty)
Added: incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/render_spec/action_with_alternate_layout.rhtml
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/render_spec/action_with_alternate_layout.rhtml?rev=725524&view=auto
==============================================================================
(empty)
Added: incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/render_spec/some_action.js.rjs
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/render_spec/some_action.js.rjs?rev=725524&view=auto
==============================================================================
--- incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/render_spec/some_action.js.rjs (added)
+++ incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/render_spec/some_action.js.rjs Wed Dec 10 17:34:18 2008
@@ -0,0 +1 @@
+# This is used for rails > 1.2.3
\ No newline at end of file
Added: incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/render_spec/some_action.rhtml
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/render_spec/some_action.rhtml?rev=725524&view=auto
==============================================================================
(empty)
Added: incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/render_spec/some_action.rjs
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/render_spec/some_action.rjs?rev=725524&view=auto
==============================================================================
--- incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/render_spec/some_action.rjs (added)
+++ incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/render_spec/some_action.rjs Wed Dec 10 17:34:18 2008
@@ -0,0 +1 @@
+# This is used for rails <= 1.2.3
Added: incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/rjs_spec/_replacement_partial.rhtml
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/rjs_spec/_replacement_partial.rhtml?rev=725524&view=auto
==============================================================================
--- incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/rjs_spec/_replacement_partial.rhtml (added)
+++ incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/rjs_spec/_replacement_partial.rhtml Wed Dec 10 17:34:18 2008
@@ -0,0 +1 @@
+This is the text in the replacement partial.
\ No newline at end of file
Added: incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/rjs_spec/hide_div.rjs
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/rjs_spec/hide_div.rjs?rev=725524&view=auto
==============================================================================
--- incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/rjs_spec/hide_div.rjs (added)
+++ incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/rjs_spec/hide_div.rjs Wed Dec 10 17:34:18 2008
@@ -0,0 +1 @@
+page.hide 'mydiv'
Added: incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/rjs_spec/hide_page_element.rjs
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/rjs_spec/hide_page_element.rjs?rev=725524&view=auto
==============================================================================
--- incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/rjs_spec/hide_page_element.rjs (added)
+++ incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/rjs_spec/hide_page_element.rjs Wed Dec 10 17:34:18 2008
@@ -0,0 +1 @@
+page['mydiv'].hide
Added: incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/rjs_spec/insert_html.rjs
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/rjs_spec/insert_html.rjs?rev=725524&view=auto
==============================================================================
--- incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/rjs_spec/insert_html.rjs (added)
+++ incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/rjs_spec/insert_html.rjs Wed Dec 10 17:34:18 2008
@@ -0,0 +1 @@
+page.insert_html 'mydiv', 'replacement text'
Added: incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/rjs_spec/replace.rjs
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/rjs_spec/replace.rjs?rev=725524&view=auto
==============================================================================
--- incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/rjs_spec/replace.rjs (added)
+++ incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/rjs_spec/replace.rjs Wed Dec 10 17:34:18 2008
@@ -0,0 +1 @@
+page.replace 'mydiv', 'replacement text'
Added: incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/rjs_spec/replace_html.rjs
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/rjs_spec/replace_html.rjs?rev=725524&view=auto
==============================================================================
--- incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/rjs_spec/replace_html.rjs (added)
+++ incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/rjs_spec/replace_html.rjs Wed Dec 10 17:34:18 2008
@@ -0,0 +1 @@
+page.replace_html 'mydiv', 'replacement text'
\ No newline at end of file
Added: incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/rjs_spec/replace_html_with_partial.rjs
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/rjs_spec/replace_html_with_partial.rjs?rev=725524&view=auto
==============================================================================
--- incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/rjs_spec/replace_html_with_partial.rjs (added)
+++ incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/rjs_spec/replace_html_with_partial.rjs Wed Dec 10 17:34:18 2008
@@ -0,0 +1 @@
+page.replace_html 'mydiv', :partial => 'rjs_spec/replacement_partial'
\ No newline at end of file
Added: incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/rjs_spec/visual_effect.rjs
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/rjs_spec/visual_effect.rjs?rev=725524&view=auto
==============================================================================
--- incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/rjs_spec/visual_effect.rjs (added)
+++ incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/rjs_spec/visual_effect.rjs Wed Dec 10 17:34:18 2008
@@ -0,0 +1 @@
+page.visual_effect :fade, 'mydiv'
Added: incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/rjs_spec/visual_toggle_effect.rjs
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/rjs_spec/visual_toggle_effect.rjs?rev=725524&view=auto
==============================================================================
--- incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/rjs_spec/visual_toggle_effect.rjs (added)
+++ incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/rjs_spec/visual_toggle_effect.rjs Wed Dec 10 17:34:18 2008
@@ -0,0 +1 @@
+page.visual_effect :toggle_blind, 'mydiv'
Added: incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/tag_spec/no_tags.rhtml
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/tag_spec/no_tags.rhtml?rev=725524&view=auto
==============================================================================
--- incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/tag_spec/no_tags.rhtml (added)
+++ incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/tag_spec/no_tags.rhtml Wed Dec 10 17:34:18 2008
@@ -0,0 +1 @@
+<!-THIS FILE HAS NO TAGS->
\ No newline at end of file
Added: incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/tag_spec/single_div_with_no_attributes.rhtml
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/tag_spec/single_div_with_no_attributes.rhtml?rev=725524&view=auto
==============================================================================
--- incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/tag_spec/single_div_with_no_attributes.rhtml (added)
+++ incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/tag_spec/single_div_with_no_attributes.rhtml Wed Dec 10 17:34:18 2008
@@ -0,0 +1 @@
+<div></div>
\ No newline at end of file
Added: incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/tag_spec/single_div_with_one_attribute.rhtml
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/tag_spec/single_div_with_one_attribute.rhtml?rev=725524&view=auto
==============================================================================
--- incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/tag_spec/single_div_with_one_attribute.rhtml (added)
+++ incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/tag_spec/single_div_with_one_attribute.rhtml Wed Dec 10 17:34:18 2008
@@ -0,0 +1 @@
+<div key="value"></div>
\ No newline at end of file
Added: incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/view_spec/_partial.rhtml
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/view_spec/_partial.rhtml?rev=725524&view=auto
==============================================================================
--- incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/view_spec/_partial.rhtml (added)
+++ incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/view_spec/_partial.rhtml Wed Dec 10 17:34:18 2008
@@ -0,0 +1,2 @@
+<%= method_in_plugin_application_helper %>
+<%= method_in_partial %>
\ No newline at end of file
Added: incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/view_spec/_partial_used_twice.rhtml
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/view_spec/_partial_used_twice.rhtml?rev=725524&view=auto
==============================================================================
(empty)
Added: incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/view_spec/_partial_with_local_variable.rhtml
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/view_spec/_partial_with_local_variable.rhtml?rev=725524&view=auto
==============================================================================
--- incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/view_spec/_partial_with_local_variable.rhtml (added)
+++ incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/view_spec/_partial_with_local_variable.rhtml Wed Dec 10 17:34:18 2008
@@ -0,0 +1 @@
+<div><%= x %></div>
\ No newline at end of file
Added: incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/view_spec/_partial_with_sub_partial.rhtml
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/view_spec/_partial_with_sub_partial.rhtml?rev=725524&view=auto
==============================================================================
--- incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/view_spec/_partial_with_sub_partial.rhtml (added)
+++ incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/view_spec/_partial_with_sub_partial.rhtml Wed Dec 10 17:34:18 2008
@@ -0,0 +1 @@
+<%= render :partial => 'partial', :object => partial %>
\ No newline at end of file
Added: incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/view_spec/_spacer.rhtml
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/view_spec/_spacer.rhtml?rev=725524&view=auto
==============================================================================
--- incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/view_spec/_spacer.rhtml (added)
+++ incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/view_spec/_spacer.rhtml Wed Dec 10 17:34:18 2008
@@ -0,0 +1 @@
+<hr id="spacer" />
Added: incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/view_spec/accessor.rhtml
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/view_spec/accessor.rhtml?rev=725524&view=auto
==============================================================================
--- incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/view_spec/accessor.rhtml (added)
+++ incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/view_spec/accessor.rhtml Wed Dec 10 17:34:18 2008
@@ -0,0 +1,5 @@
+<div id="session"><%= session[:key] %></div>
+<div id="params"><%= params[:key] %></div>
+<div id="flash"><%= flash[:key] %></div>
+<div id="controller"><%= params[:controller] %></div>
+<div id="action"><%= params[:action] %></div>
Added: incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/view_spec/block_helper.rhtml
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/view_spec/block_helper.rhtml?rev=725524&view=auto
==============================================================================
--- incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/view_spec/block_helper.rhtml (added)
+++ incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/view_spec/block_helper.rhtml Wed Dec 10 17:34:18 2008
@@ -0,0 +1,3 @@
+<% if_allowed do %>
+ <div>block helper was rendered</div>
+<% end %>
\ No newline at end of file
Added: incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/view_spec/entry_form.rhtml
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/view_spec/entry_form.rhtml?rev=725524&view=auto
==============================================================================
--- incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/view_spec/entry_form.rhtml (added)
+++ incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/view_spec/entry_form.rhtml Wed Dec 10 17:34:18 2008
@@ -0,0 +1,2 @@
+<% form_tag do %>
+<% end %>
\ No newline at end of file
Propchange: incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/view_spec/entry_form.rhtml
------------------------------------------------------------------------------
svn:executable = *
Added: incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/view_spec/explicit_helper.rhtml
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/view_spec/explicit_helper.rhtml?rev=725524&view=auto
==============================================================================
--- incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/view_spec/explicit_helper.rhtml (added)
+++ incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/view_spec/explicit_helper.rhtml Wed Dec 10 17:34:18 2008
@@ -0,0 +1,2 @@
+<%= method_in_plugin_application_helper %>
+<%= method_in_explicit_helper %>
Added: incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/view_spec/foo/show.rhtml
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/view_spec/foo/show.rhtml?rev=725524&view=auto
==============================================================================
--- incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/view_spec/foo/show.rhtml (added)
+++ incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/view_spec/foo/show.rhtml Wed Dec 10 17:34:18 2008
@@ -0,0 +1 @@
+<%= method_in_plugin_application_helper %>
Added: incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/view_spec/implicit_helper.rhtml
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/view_spec/implicit_helper.rhtml?rev=725524&view=auto
==============================================================================
--- incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/view_spec/implicit_helper.rhtml (added)
+++ incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/view_spec/implicit_helper.rhtml Wed Dec 10 17:34:18 2008
@@ -0,0 +1,2 @@
+<%= method_in_plugin_application_helper %>
+<%= method_in_helper %>
Added: incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/view_spec/multiple_helpers.rhtml
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/view_spec/multiple_helpers.rhtml?rev=725524&view=auto
==============================================================================
--- incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/view_spec/multiple_helpers.rhtml (added)
+++ incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/view_spec/multiple_helpers.rhtml Wed Dec 10 17:34:18 2008
@@ -0,0 +1,3 @@
+<%= method_in_plugin_application_helper %>
+<%= method_in_explicit_helper %>
+<%= method_in_more_explicit_helper %>
\ No newline at end of file
Added: incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/view_spec/path_params.html.erb
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/view_spec/path_params.html.erb?rev=725524&view=auto
==============================================================================
--- incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/view_spec/path_params.html.erb (added)
+++ incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/view_spec/path_params.html.erb Wed Dec 10 17:34:18 2008
@@ -0,0 +1 @@
+<%= params[:controller] %>
\ No newline at end of file
Added: incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/view_spec/should_not_receive.rhtml
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/view_spec/should_not_receive.rhtml?rev=725524&view=auto
==============================================================================
--- incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/view_spec/should_not_receive.rhtml (added)
+++ incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/view_spec/should_not_receive.rhtml Wed Dec 10 17:34:18 2008
@@ -0,0 +1,3 @@
+<% if @obj.render_partial? %>
+ <%= render :partial => 'some_partial' %>
+<% end %>
Added: incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/view_spec/template_with_partial.rhtml
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/view_spec/template_with_partial.rhtml?rev=725524&view=auto
==============================================================================
--- incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/view_spec/template_with_partial.rhtml (added)
+++ incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/view_spec/template_with_partial.rhtml Wed Dec 10 17:34:18 2008
@@ -0,0 +1,5 @@
+<%= method_in_template_with_partial %>
+<%= render :partial => 'partial' %>
+
+<%= render :partial => 'partial_used_twice' %>
+<%= render :partial => 'partial_used_twice' %>
Added: incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/view_spec/template_with_partial_using_collection.rhtml
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/view_spec/template_with_partial_using_collection.rhtml?rev=725524&view=auto
==============================================================================
--- incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/view_spec/template_with_partial_using_collection.rhtml (added)
+++ incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/view_spec/template_with_partial_using_collection.rhtml Wed Dec 10 17:34:18 2008
@@ -0,0 +1,3 @@
+<%= render :partial => 'partial',
+ :collection => ['Alice', 'Bob'],
+ :spacer_template => 'spacer' %>
Added: incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/view_spec/template_with_partial_with_array.rhtml
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/view_spec/template_with_partial_with_array.rhtml?rev=725524&view=auto
==============================================================================
--- incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/view_spec/template_with_partial_with_array.rhtml (added)
+++ incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/resources/views/view_spec/template_with_partial_with_array.rhtml Wed Dec 10 17:34:18 2008
@@ -0,0 +1 @@
+<%= render :partial => @array %>
Modified: incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/spec_helper.rb
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/spec_helper.rb?rev=725524&r1=725523&r2=725524&view=diff
==============================================================================
--- incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/spec_helper.rb (original)
+++ incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/spec/spec_helper.rb Wed Dec 10 17:34:18 2008
@@ -1,24 +1,30 @@
dir = File.dirname(__FILE__)
$LOAD_PATH.unshift(File.expand_path("#{dir}/../rspec/lib"))
-$LOAD_PATH.unshift(File.expand_path("#{dir}/../spec_resources/controllers"))
-$LOAD_PATH.unshift(File.expand_path("#{dir}/../spec_resources/helpers"))
+$LOAD_PATH.unshift(File.expand_path("#{dir}/resources/controllers"))
+$LOAD_PATH.unshift(File.expand_path("#{dir}/resources/helpers"))
require File.expand_path("#{dir}/../../../../spec/spec_helper")
-require File.expand_path("#{dir}/../spec_resources/controllers/render_spec_controller")
-require File.expand_path("#{dir}/../spec_resources/controllers/rjs_spec_controller")
-require File.expand_path("#{dir}/../spec_resources/controllers/redirect_spec_controller")
-require File.expand_path("#{dir}/../spec_resources/controllers/action_view_base_spec_controller")
-require File.expand_path("#{dir}/../spec_resources/helpers/explicit_helper")
-require File.expand_path("#{dir}/../spec_resources/helpers/more_explicit_helper")
-require File.expand_path("#{dir}/../spec_resources/helpers/view_spec_helper")
-require File.expand_path("#{dir}/../spec_resources/helpers/plugin_application_helper")
-
-ActionController::Routing.controller_paths << "#{dir}/../spec_resources/controllers"
+require File.expand_path("#{dir}/resources/controllers/render_spec_controller")
+require File.expand_path("#{dir}/resources/controllers/rjs_spec_controller")
+require File.expand_path("#{dir}/resources/controllers/redirect_spec_controller")
+require File.expand_path("#{dir}/resources/controllers/action_view_base_spec_controller")
+require File.expand_path("#{dir}/resources/helpers/addition_helper")
+require File.expand_path("#{dir}/resources/helpers/explicit_helper")
+require File.expand_path("#{dir}/resources/helpers/more_explicit_helper")
+require File.expand_path("#{dir}/resources/helpers/view_spec_helper")
+require File.expand_path("#{dir}/resources/helpers/plugin_application_helper")
+
+extra_controller_paths = File.expand_path("#{dir}/resources/controllers")
+
+unless ActionController::Routing.controller_paths.include?(extra_controller_paths)
+ ActionController::Routing.instance_eval {@possible_controllers = nil}
+ ActionController::Routing.controller_paths << extra_controller_paths
+end
module Spec
module Rails
module Example
class ViewExampleGroupController
- set_view_path File.join(File.dirname(__FILE__), "..", "spec_resources", "views")
+ set_view_path File.join(File.dirname(__FILE__), "..", "spec", "resources", "views")
end
end
end
@@ -38,6 +44,12 @@
end
end
+Spec::Runner.configure do |config|
+ config.before(:each, :type => :controller) do
+ end
+end
+
+
ActionController::Routing::Routes.draw do |map|
map.resources :rspec_on_rails_specs
map.connect 'custom_route', :controller => 'custom_route_spec', :action => 'custom_route'
Added: incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/stories/configuration/stories.rb
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/stories/configuration/stories.rb?rev=725524&view=auto
==============================================================================
--- incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/stories/configuration/stories.rb (added)
+++ incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/stories/configuration/stories.rb Wed Dec 10 17:34:18 2008
@@ -0,0 +1,5 @@
+require File.join(File.dirname(__FILE__), *%w[.. helper])
+
+with_steps_for :running_rspec do
+ run File.join(File.dirname(__FILE__), *%w[.. .. .. rspec stories configuration before_blocks.story]), :type => RailsStory
+end
\ No newline at end of file
Modified: incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/stories/helper.rb
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/stories/helper.rb?rev=725524&r1=725523&r2=725524&view=diff
==============================================================================
--- incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/stories/helper.rb (original)
+++ incubator/olio/webapp/rails/trunk/vendor/plugins/rspec-rails/stories/helper.rb Wed Dec 10 17:34:18 2008
@@ -1,5 +1,6 @@
dir = File.dirname(__FILE__)
$LOAD_PATH.unshift File.expand_path("#{dir}/../lib")
require File.expand_path("#{dir}/../../../../spec/spec_helper")
+require File.expand_path("#{dir}/../../rspec/stories/helper")
require 'spec/rails/story_adapter'
\ No newline at end of file