aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2016-10-21 16:14:39 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2016-10-21 16:14:39 -0300
commite16a5fb508bf7833d7f7a9429ccd3b20990b7d4b (patch)
tree127872fdf2f228e7723ca82094511ce95c165055
parent2b584f165bc919c5e698e52d84c582a2f5f22b35 (diff)
downloadrails-e16a5fb508bf7833d7f7a9429ccd3b20990b7d4b.tar.gz
rails-e16a5fb508bf7833d7f7a9429ccd3b20990b7d4b.tar.bz2
rails-e16a5fb508bf7833d7f7a9429ccd3b20990b7d4b.zip
Revert "Undefine assings in IntegrationTest"
This reverts commit 5dde413e1d14c42eb87071db20d075a7b962cb01. Reason: The gem defines it so we don't need to remove
-rw-r--r--actionpack/lib/action_dispatch/testing/integration.rb2
-rw-r--r--actionpack/test/controller/integration_test.rb8
2 files changed, 0 insertions, 10 deletions
diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb
index e24b943026..e2ea96513c 100644
--- a/actionpack/lib/action_dispatch/testing/integration.rb
+++ b/actionpack/lib/action_dispatch/testing/integration.rb
@@ -599,8 +599,6 @@ 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 652c0f0dd2..1f02e0e908 100644
--- a/actionpack/test/controller/integration_test.rb
+++ b/actionpack/test/controller/integration_test.rb
@@ -153,14 +153,6 @@ 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.