diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..e7507d9af --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,35 @@ +PATH + remote: . + specs: + rspec-rails (1.3.4) + rack (>= 1.0.0) + rspec (~> 1.3.1) + +GEM + remote: http://rubygems.org/ + specs: + builder (3.2.2) + cucumber (1.3.20) + builder (>= 2.1.2) + diff-lcs (>= 1.1.3) + gherkin (~> 2.12) + multi_json (>= 1.7.5, < 2.0) + multi_test (>= 0.1.2) + diff-lcs (1.2.5) + gherkin (2.12.2) + multi_json (~> 1.3) + multi_json (1.11.2) + multi_test (0.1.2) + rack (1.4.7) + rspec (1.3.2) + +PLATFORMS + ruby + +DEPENDENCIES + cucumber (>= 0.3.99) + rack (= 1.4.7) + rspec-rails! + +BUNDLED WITH + 1.16.1 diff --git a/README.rdoc b/README.rdoc index 06360d905..a3d513b2f 100644 --- a/README.rdoc +++ b/README.rdoc @@ -1,3 +1,12 @@ += rspec-rails 1.3 for Rails 2.3 LTS + +This is a maintenance fork of +rspec-rails+ 1.3 to be used with {Rails 2.3 LTS}[https://railslts.com]. + +There is also a {maintenance fork of +rspec-rails+ 2.14}[https://github.com/makandra/rspec-rails/tree/2-14-lts] to be used with {Rails 3.2 LTS}[https://railslts.com]. + +If you are looking for modern versions of this gem, see http://github.com/rspec/rspec-rails. + + = Spec::Rails * http://rspec.info @@ -13,9 +22,6 @@ Behaviour Driven Development for Ruby on Rails. rspec-rails is an RSpec extension that allows you to drive the development of Ruby on Rails applications with RSpec. -This is the repository for rspec-rails-1.x. If you're looking -for rspec-rails-2 for rails-3, see http://github.com/rspec/rspec-rails. - == FEATURES: * Use RSpec to independently specify Rails Models, Views, Controllers and Helpers diff --git a/lib/spec/rails/example/controller_example_group.rb b/lib/spec/rails/example/controller_example_group.rb index 4dcac0e2c..8b21668c3 100644 --- a/lib/spec/rails/example/controller_example_group.rb +++ b/lib/spec/rails/example/controller_example_group.rb @@ -195,6 +195,7 @@ def render(*args) def record_render(opts) return unless @_rendered @_rendered[:template] ||= opts[:file] if opts[:file] + @_rendered[:template] ||= opts[:file_in_view_path] if opts[:file_in_view_path] @_rendered[:partials][opts[:partial]] += 1 if opts[:partial] end