aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--actionpack/lib/action_dispatch/testing/integration.rb2
-rw-r--r--actionpack/test/controller/integration_test.rb8
2 files changed, 10 insertions, 0 deletions
diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb
index 720651fa1f..265459f79e 100644
--- a/actionpack/lib/action_dispatch/testing/integration.rb
+++ b/actionpack/lib/action_dispatch/testing/integration.rb
@@ -713,6 +713,8 @@ module ActionDispatch
class IntegrationTest < ActiveSupport::TestCase
include TestProcess
+ undef :assigns
+
module UrlOptions
extend ActiveSupport::Concern
def url_options
diff --git a/actionpack/test/controller/integration_test.rb b/actionpack/test/controller/integration_test.rb
index d3bc77d3ef..cf96b9b752 100644
--- a/actionpack/test/controller/integration_test.rb
+++ b/actionpack/test/controller/integration_test.rb
@@ -383,6 +383,14 @@ class IntegrationTestTest < ActiveSupport::TestCase
mixin.__send__(:remove_method, :method_missing)
end
end
+
+ def test_assigns_is_undefined_and_not_point_to_the_gem
+ e = assert_raises(NoMethodError) do
+ @test.assigns(:foo)
+ end
+
+ assert_match(/undefined method/, e.message)
+ end
end
# Tests that integration tests don't call Controller test methods for processing.