Merge pull request #4500 from tomhughes/oauth10-registration-disable

[rails.git] / test / test_helper.rb

diff --git a/test/test_helper.rb b/test/test_helper.rb
index 9d06d23534f8cdcb9ea297aa4bd1cf048263a6f6..5bf8a5239ecfe2c6625eb969b98c625cf5a81484 100644 (file)
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -243,9 +243,11 @@ module ActiveSupport
 
     def sign_in_as(user)
       visit login_path
-      fill_in "username", :with => user.email
-      fill_in "password", :with => "test"
-      click_on "Login", :match => :first
+      within "form", :text => "Email Address or Username" do
+        fill_in "username", :with => user.email
+        fill_in "password", :with => "test"
+        click_on "Login"
+      end
     end
 
     def session_for(user)
@@ -372,6 +374,16 @@ module ActiveSupport
       end
     end
 
+    def with_settings(settings)
+      saved_settings = Settings.to_hash.slice(*settings.keys)
+
+      Settings.merge!(settings)
+
+      yield
+    ensure
+      Settings.merge!(saved_settings)
+    end
+
     def with_user_account_deletion_delay(value)
       freeze_time
       default_value = Settings.user_account_deletion_delay