diff options
| author | Mikel Lindsaar <raasdnil@gmail.com> | 2010-03-28 14:44:34 +1100 |
|---|---|---|
| committer | Mikel Lindsaar <raasdnil@gmail.com> | 2010-03-28 14:44:34 +1100 |
| commit | 2bcc2ebf44b59e46c104c92d621e8051c97bfcf5 (patch) | |
| tree | d2a3f04fd3020c1b5d88847af62d52f2d5e5bd61 /actionpack/test/controller/integration_test.rb | |
| parent | f5774e3e3f70a3acfa559b9ff889e9417fb71d4b (diff) | |
| parent | 8398f21880a952769ccd6437a4344922fe596dab (diff) | |
| download | rails-2bcc2ebf44b59e46c104c92d621e8051c97bfcf5.tar.gz rails-2bcc2ebf44b59e46c104c92d621e8051c97bfcf5.tar.bz2 rails-2bcc2ebf44b59e46c104c92d621e8051c97bfcf5.zip | |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'actionpack/test/controller/integration_test.rb')
| -rw-r--r-- | actionpack/test/controller/integration_test.rb | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/actionpack/test/controller/integration_test.rb b/actionpack/test/controller/integration_test.rb index 2180466ca7..c9782856bd 100644 --- a/actionpack/test/controller/integration_test.rb +++ b/actionpack/test/controller/integration_test.rb @@ -173,14 +173,12 @@ class IntegrationTestTest < Test::Unit::TestCase end def test_opens_new_session - @test.class.expects(:fixture_table_names).times(2).returns(['foo']) - session1 = @test.open_session { |sess| } session2 = @test.open_session # implicit session - assert_kind_of ::ActionController::Integration::Session, session1 - assert_kind_of ::ActionController::Integration::Session, session2 - assert_not_equal session1, session2 + assert session1.respond_to?(:assert_template), "open_session makes assert_template available" + assert session2.respond_to?(:assert_template), "open_session makes assert_template available" + assert !session1.equal?(session2) end # RSpec mixes Matchers (which has a #method_missing) into |