Rework OpenID tests for new flows using OmniAuth mocking

[rails.git] / test / helpers / application_helper_test.rb

diff --git a/test/helpers/application_helper_test.rb b/test/helpers/application_helper_test.rb
index 5604b09bfef2585225900b554af70354a355d8e7..e48b84e4c56e11b8c44e97213b7c4bc421a6aed1 100644 (file)
--- a/test/helpers/application_helper_test.rb
+++ b/test/helpers/application_helper_test.rb
@@ -1,4 +1,4 @@
-require 'test_helper'
+require "test_helper"

 
 class ApplicationHelperTest < ActionView::TestCase
   fixtures :users, :user_roles
 
 class ApplicationHelperTest < ActionView::TestCase
   fixtures :users, :user_roles


@@ -7,10 +7,6 @@ class ApplicationHelperTest < ActionView::TestCase
     I18n.locale = "en"
   end
 
     I18n.locale = "en"
   end
 

-  def setup
-    I18n.locale = "en"
-  end
-

   def test_linkify
     %w(http://example.com/test ftp://example.com/test https://example.com/test).each do |link|
       text = "Test #{link} is made into a link"
   def test_linkify
     %w(http://example.com/test ftp://example.com/test https://example.com/test).each do |link|
       text = "Test #{link} is made into a link"


@@ -20,7 +16,7 @@ class ApplicationHelperTest < ActionView::TestCase
       assert_dom_equal "Test <a href=\"#{link}\" rel=\"nofollow\">#{link}</a> is made into a link", html
 
       html = linkify(text.html_safe)
       assert_dom_equal "Test <a href=\"#{link}\" rel=\"nofollow\">#{link}</a> is made into a link", html
 
       html = linkify(text.html_safe)

-      assert_equal true, html.html_safe?    
+      assert_equal true, html.html_safe?

       assert_dom_equal "Test <a href=\"#{link}\" rel=\"nofollow\">#{link}</a> is made into a link", html
     end
 
       assert_dom_equal "Test <a href=\"#{link}\" rel=\"nofollow\">#{link}</a> is made into a link", html
     end
 


@@ -32,7 +28,7 @@ class ApplicationHelperTest < ActionView::TestCase
       assert_dom_equal text, html
 
       html = linkify(text.html_safe)
       assert_dom_equal text, html
 
       html = linkify(text.html_safe)

-      assert_equal true, html.html_safe?    
+      assert_equal true, html.html_safe?

       assert_dom_equal text, html
     end
   end
       assert_dom_equal text, html
     end
   end