Merge remote-tracking branch 'upstream/master' into vagrant

[rails.git] / test / integration / client_application_test.rb

diff --git a/test/integration/client_application_test.rb b/test/integration/client_application_test.rb
index f34a9c430fbf14463727caa42f8b24b4ccf2e9e1..a2361d618f88c02df824f90628512384aa1e04a2 100644 (file)
--- a/test/integration/client_application_test.rb
+++ b/test/integration/client_application_test.rb
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
-class ClientApplicationTest < ActionController::IntegrationTest
+class ClientApplicationTest < ActionDispatch::IntegrationTest
   fixtures :users, :client_applications
 
   ##
@@ -79,27 +79,16 @@ class ClientApplicationTest < ActionController::IntegrationTest
   ##
   # utility method to make the HTML screening easier to read.
   def assert_in_heading
-    assert_select "html:root" do
-      assert_select "body" do
-        assert_select "div.wrapper" do
-          assert_select "div.content-heading" do
-            yield
-          end
-        end
-      end
+    assert_select "div.content-heading" do
+      yield
     end
   end
 
   ##
   # utility method to make the HTML screening easier to read.
   def assert_in_body
-    assert_select "html:root" do
-      assert_select "body" do
-        assert_select "div#content" do
-          yield
-        end
-      end
+    assert_select "div#content" do
+      yield
     end
   end
-
 end