Merge remote-tracking branch 'origin/master' into feature/clean-up-pjax-for-now

3 files changed, 15 insertions, 6 deletions

diff --git a/users/test/functional/users_controller_test.rb b/users/test/functional/users_controller_test.rb
index 1840a72..ce17500 100644
--- a/users/test/functional/users_controller_test.rb
+++ b/users/test/functional/users_controller_test.rb
@@ -1,7 +1,6 @@
 require 'test_helper'
 
 class UsersControllerTest < ActionController::TestCase
-  include StubRecordHelper
 
   test "should get new" do
     get :new
@@ -35,7 +34,10 @@ class UsersControllerTest < ActionController::TestCase
   end
 
   test "should get edit view" do
-    user = find_record User, :email => nil, :email_forward => nil
+    user = find_record User,
+      :email => nil,
+      :email_forward => nil,
+      :email_aliases => []
 
     login user
     get :edit, :id => user.id
@@ -45,7 +47,9 @@ class UsersControllerTest < ActionController::TestCase
 
   test "should process updated params" do
     user = find_record User
-    user.expects(:update_attributes).with(user.params).returns(true)
+    user.expects(:attributes=).with(user.params)
+    user.expects(:changed?).returns(true)
+    user.expects(:save).returns(true)
 
     login user
     put :update, :user => user.params, :id => user.id, :format => :json
@@ -57,7 +61,9 @@ class UsersControllerTest < ActionController::TestCase
 
   test "admin can update user" do
     user = find_record User
-    user.expects(:update_attributes).with(user.params).returns(true)
+    user.expects(:attributes=).with(user.params)
+    user.expects(:changed?).returns(true)
+    user.expects(:save).returns(true)
 
     login :is_admin? => true
     put :update, :user => user.params, :id => user.id, :format => :json
diff --git a/users/test/support/auth_test_helper.rb b/users/test/support/auth_test_helper.rb
index 6a82f24..c9f5612 100644
--- a/users/test/support/auth_test_helper.rb
+++ b/users/test/support/auth_test_helper.rb
@@ -1,5 +1,4 @@
 module AuthTestHelper
-  include StubRecordHelper
   extend ActiveSupport::Concern
 
   # Controller will fetch current user from warden.
@@ -24,7 +23,7 @@ module AuthTestHelper
       assert_equal({:alert => "Not authorized"}, flash.to_hash)
       # todo: eventually probably eliminate separate conditions
       assert_redirected_to login_path if !logged_in
-      assert_redirected_to root_path if logged_in 
+      assert_redirected_to root_path if logged_in
     else
       assert flash[:alert].blank?
     end
diff --git a/users/test/support/stub_record_helper.rb b/users/test/support/stub_record_helper.rb
index 2e1a533..1be419a 100644
--- a/users/test/support/stub_record_helper.rb
+++ b/users/test/support/stub_record_helper.rb
@@ -39,3 +39,7 @@ module StubRecordHelper
   end
 
 end
+
+class ActionController::TestCase
+  include StubRecordHelper
+end