Changeset 7319

Timestamp:

08/15/07 03:57:17 (1 year ago)

Author:

nzkoz

Message:

Integration tests: introduce methods for other HTTP methods. Closes #6353. Merges [6203]

Files:

• branches/1-2-stable/actionpack/CHANGELOG (modified) (1 diff)
• branches/1-2-stable/actionpack/lib/action_controller/integration.rb (modified) (1 diff)
• branches/1-2-stable/actionpack/test/controller/integration_test.rb (modified) (2 diffs)

branches/1-2-stable/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Integration tests: introduce methods for other HTTP methods.  #6353 [caboose]
-
-* Improve performance of action caching. Closes #8231 [skaes]

branches/1-2-stable/actionpack/lib/action_controller/integration.rb

@@ -501 +501 @@
-    end
-
-
+put head delete 
-      define_method(method) do |*args|
-        reset! unless @integration_session

branches/1-2-stable/actionpack/test/controller/integration_test.rb

@@ -12 +12 @@
-  module Integration
-    class Session
-
+(*args)
-      end
-
@@ -196 +196 @@
-end
-
+class IntegrationTestTest < Test::Unit::TestCase
+
+  def setup
+    @test = ::ActionController::IntegrationTest.new(:default_test)
+    @test.class.stubs(:fixture_table_names).returns([])
+    @session = @test.open_session
+  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_equal ::ActionController::Integration::Session, session1.class
+    assert_equal ::ActionController::Integration::Session, session2.class
+    assert_not_equal session1, session2
+  end
+
+end
+
+# Tests that integration tests don't call Controller test methods for processing.
+# Integration tests have their own setup and teardown.
+class IntegrationTestUsesCorrectClass < ActionController::IntegrationTest
+
+  def self.fixture_table_names
+    []
+  end
+
+  def test_integration_methods_called
+    %w( get post head put delete ).each do |verb|
+      assert_nothing_raised("'#{verb}' should use integration test methods") { send(verb, '/') }
+    end
+  end
+
+end
+
-# TODO
-# class MockCGITest < Test::Unit::TestCase