X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ed699548e64fc96289b6b04ccd5303692baafffa..821a22c6073d4b50ae7038e9c1aacbb5e68cd55a:/test/integration/client_application_test.rb?ds=sidebyside diff --git a/test/integration/client_application_test.rb b/test/integration/client_application_test.rb index f34a9c430..a2361d618 100644 --- 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