Merge conflicts resolved

Author: xionon

test/test_helper.rb

@@ -22,3 +22,7 @@
 if ActiveSupport::TestCase.method_defined?(:fixture_path=)
   ActiveSupport::TestCase.fixture_path = File.expand_path("../fixtures", __FILE__)
 end
+
+def wait_for_turbolinks_to_be_available
+  sleep(1)
+end

test/view_helper_test.rb

@@ -62,13 +62,13 @@ class ViewHelperTest < ActionDispatch::IntegrationTest
     page.execute_script('history.back();')
     assert page.has_content?('Hello Alice')
 
+    wait_for_turbolinks_to_be_available()
+
     # Try Turbolinks javascript API.
     page.execute_script('Turbolinks.visit("/pages/2");')
     assert page.has_content?('Hello Alice')
 
-    # Sometimes Turbolinks isn't available right away. We need to wait for a brief moment
-    # for phantomJS to finish loading javascript.
-    sleep(1)
+    wait_for_turbolinks_to_be_available()
 
     page.execute_script('Turbolinks.visit("/pages/1");')
     assert page.has_content?('Hello Bob')