From ec87ccfa185a4c063386d385de7af15f993b77d8 Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Thu, 22 Nov 2012 16:22:18 +0100
Subject: fixed tests

---
 users/test/functional/sessions_controller_test.rb |  9 +++---
 users/test/integration/api/account_flow_test.rb   | 39 ++++++++++++-----------
 2 files changed, 25 insertions(+), 23 deletions(-)

(limited to 'users/test')

diff --git a/users/test/functional/sessions_controller_test.rb b/users/test/functional/sessions_controller_test.rb
index 8f2d95c..93cc032 100644
--- a/users/test/functional/sessions_controller_test.rb
+++ b/users/test/functional/sessions_controller_test.rb
@@ -26,11 +26,12 @@ class SessionsControllerTest < ActionController::TestCase
   end
 
   test "renders warden errors" do
-    strategy = stub :message => "Warden auth did not work"
-    request.env['warden'].expects(:winning_strategy).returns(strategy)
+    strategy = stub :message => {:field => :translate_me}
+    request.env['warden'].stubs(:winning_strategy).returns(strategy)
+    I18n.expects(:t).with(:translate_me).at_least_once.returns("translation stub")
     get :new, :format => :json
-    assert_response :success
-    assert_json_response :errors => strategy.message
+    assert_response 422
+    assert_json_response :errors => {"field" => "translation stub"}
   end
 
   # Warden takes care of parsing the params and
diff --git a/users/test/integration/api/account_flow_test.rb b/users/test/integration/api/account_flow_test.rb
index c9a7109..4135485 100644
--- a/users/test/integration/api/account_flow_test.rb
+++ b/users/test/integration/api/account_flow_test.rb
@@ -16,24 +16,6 @@ class AccountFlowTest < ActiveSupport::TestCase
     Warden.test_reset!
   end
 
-  # this test wraps the api and implements the interface the ruby-srp client.
-  def handshake(login, aa)
-    post "/sessions.json", :login => login, 'A' => aa.to_s(16), :format => :json
-    assert last_response.successful?
-    response = JSON.parse(last_response.body)
-    if response['errors']
-      raise RECORD_NOT_FOUND.new(response['errors'])
-    else
-      return response['B'].hex
-    end
-  end
-
-  def validate(m)
-    put "/sessions/" + @login + '.json', :client_auth => m.to_s(16), :format => :json
-    assert last_response.successful?
-    return JSON.parse(last_response.body)
-  end
-
   def setup
     @login = "integration_test_user"
     User.find_by_login(@login).tap{|u| u.destroy if u}
@@ -52,6 +34,22 @@ class AccountFlowTest < ActiveSupport::TestCase
     @user.destroy if @user # make sure we can run this test again
   end
 
+  # this test wraps the api and implements the interface the ruby-srp client.
+  def handshake(login, aa)
+    post "/sessions.json", :login => login, 'A' => aa.to_s(16), :format => :json
+    response = JSON.parse(last_response.body)
+    if response['errors']
+      raise RECORD_NOT_FOUND.new(response['errors'])
+    else
+      return response['B'].hex
+    end
+  end
+
+  def validate(m)
+    put "/sessions/" + @login + '.json', :client_auth => m.to_s(16), :format => :json
+    return JSON.parse(last_response.body)
+  end
+
   test "signup response" do
     assert_json_response :login => @login, :ok => true
     assert last_response.successful?
@@ -59,6 +57,7 @@ class AccountFlowTest < ActiveSupport::TestCase
 
   test "signup and login with srp via api" do
     server_auth = @srp.authenticate(self)
+    assert last_response.successful?
     assert_nil server_auth["errors"]
     assert server_auth["M2"]
   end
@@ -66,7 +65,8 @@ class AccountFlowTest < ActiveSupport::TestCase
   test "signup and wrong password login attempt" do
     srp = SRP::Client.new(@login, "wrong password")
     server_auth = srp.authenticate(self)
-    assert_equal "Could not log in", server_auth["errors"]['password']
+    assert !last_response.successful?
+    assert_equal "wrong password", server_auth["errors"]['password']
     assert_nil server_auth["M2"]
   end
 
@@ -76,6 +76,7 @@ class AccountFlowTest < ActiveSupport::TestCase
     assert_raises RECORD_NOT_FOUND do
       server_auth = srp.authenticate(self)
     end
+    assert !last_response.successful?
     assert_nil server_auth
   end
 
-- 
cgit v1.2.3


From 3ce5a25afef3b938c2bbbe8ce481f2af9e0c24dc Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Fri, 23 Nov 2012 10:24:46 +0100
Subject: test editing user settings

---
 users/test/functional/users_controller_test.rb | 31 ++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

(limited to 'users/test')

diff --git a/users/test/functional/users_controller_test.rb b/users/test/functional/users_controller_test.rb
index 1cb28a6..feae2dd 100644
--- a/users/test/functional/users_controller_test.rb
+++ b/users/test/functional/users_controller_test.rb
@@ -30,4 +30,35 @@ class UsersControllerTest < ActionController::TestCase
     assert_redirected_to new_user_path
   end
 
+  test "should get edit view" do
+    params = User.valid_attributes_hash
+    user = stub params.merge(:id => 123, :class => User, :to_key => ['123'], :new_record? => false, :persisted? => :true)
+    login user
+    get :edit, :id => user.id
+    assert_equal user, assigns[:user]
+  end
+
+  test "should process updated params" do
+    params = User.valid_attributes_hash
+    user = stub params.merge(:id => 123)
+    params.stringify_keys!
+    user.expects(:update).with(params).returns(user)
+    login user
+    post :update, :user => params, :id => user.id
+    assert_equal user, assigns[:user]
+    assert_response :redirect
+    assert_redirected_to edit_user_path(user)
+  end
+
+  test "should validate updated params" do
+    params = User.valid_attributes_hash
+    user = stub params.merge(:id => 123)
+    params.stringify_keys!
+    user.expects(:update).with(params).returns(user)
+    login user
+    post :update, :user => params, :id => user.id
+    assert_equal user, assigns[:user]
+  end
+
+
 end
-- 
cgit v1.2.3


From 46c0140a8eab632c783d309a7afd87cb7aad4280 Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Fri, 23 Nov 2012 10:55:49 +0100
Subject: refactored creation of record stubs

---
 users/test/functional/users_controller_test.rb | 33 +++++++-------------------
 users/test/support/auth_test_helper.rb         |  3 +++
 users/test/support/stub_record_helper.rb       | 18 ++++++++++++++
 3 files changed, 30 insertions(+), 24 deletions(-)
 create mode 100644 users/test/support/stub_record_helper.rb

(limited to 'users/test')

diff --git a/users/test/functional/users_controller_test.rb b/users/test/functional/users_controller_test.rb
index feae2dd..4318928 100644
--- a/users/test/functional/users_controller_test.rb
+++ b/users/test/functional/users_controller_test.rb
@@ -1,6 +1,8 @@
 require 'test_helper'
 
 class UsersControllerTest < ActionController::TestCase
+  include StubRecordHelper
+
   test "should get new" do
     get :new
     assert_equal User, assigns(:user).class
@@ -8,11 +10,9 @@ class UsersControllerTest < ActionController::TestCase
   end
 
   test "should create new user" do
-    params = User.valid_attributes_hash
-    user = stub params.merge(:id => 123)
-    params.stringify_keys!
-    User.expects(:create!).with(params).returns(user)
-    post :create, :user => params
+    user = stub_record User
+    User.expects(:create!).with(user.params).returns(user)
+    post :create, :user => user.params
     assert_nil session[:user_id]
     assert_response :redirect
     assert_redirected_to root_url
@@ -31,34 +31,19 @@ class UsersControllerTest < ActionController::TestCase
   end
 
   test "should get edit view" do
-    params = User.valid_attributes_hash
-    user = stub params.merge(:id => 123, :class => User, :to_key => ['123'], :new_record? => false, :persisted? => :true)
+    user = stub_record User
     login user
     get :edit, :id => user.id
     assert_equal user, assigns[:user]
   end
 
   test "should process updated params" do
-    params = User.valid_attributes_hash
-    user = stub params.merge(:id => 123)
-    params.stringify_keys!
-    user.expects(:update).with(params).returns(user)
+    user = stub_record User
+    user.expects(:update).with(user.params).returns(user)
     login user
-    post :update, :user => params, :id => user.id
+    post :update, :user => user.params, :id => user.id
     assert_equal user, assigns[:user]
     assert_response :redirect
     assert_redirected_to edit_user_path(user)
   end
-
-  test "should validate updated params" do
-    params = User.valid_attributes_hash
-    user = stub params.merge(:id => 123)
-    params.stringify_keys!
-    user.expects(:update).with(params).returns(user)
-    login user
-    post :update, :user => params, :id => user.id
-    assert_equal user, assigns[:user]
-  end
-
-
 end
diff --git a/users/test/support/auth_test_helper.rb b/users/test/support/auth_test_helper.rb
index f211597..0b73f5f 100644
--- a/users/test/support/auth_test_helper.rb
+++ b/users/test/support/auth_test_helper.rb
@@ -11,6 +11,9 @@ module AuthTestHelper
 
   def login(user = nil)
     @current_user = user || stub
+    unless @current_user.respond_to? :is_admin?
+      @current_user.stubs(:is_admin?).returns(false)
+    end
     request.env['warden'] = stub :user => @current_user
     return @current_user
   end
diff --git a/users/test/support/stub_record_helper.rb b/users/test/support/stub_record_helper.rb
new file mode 100644
index 0000000..95b9d63
--- /dev/null
+++ b/users/test/support/stub_record_helper.rb
@@ -0,0 +1,18 @@
+module StubRecordHelper
+
+  # Create a stub that has the usual functions of a database record.
+  # It won't fail on rendering a form for example.
+  def stub_record(klass, params = {}, persisted = true)
+    if klass.respond_to?(:valid_attributes_hash)
+      params.reverse_merge!(klass.valid_attributes_hash)
+    end
+    params[:params] = params.stringify_keys
+    params.reverse_merge! :id => 123,
+      :class => klass,
+      :to_key => ['123'],
+      :new_record? => !persisted,
+      :persisted? => persisted
+    stub params
+  end
+
+end
-- 
cgit v1.2.3


From ee3c9146e4bbe93ec1f00ee45386a82ec4363c4d Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Fri, 23 Nov 2012 12:11:11 +0100
Subject: identify user by id so rerendering the form does not use new invalid
 login

---
 users/test/functional/users_controller_test.rb | 4 +++-
 users/test/unit/user_test.rb                   | 8 ++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'users/test')

diff --git a/users/test/functional/users_controller_test.rb b/users/test/functional/users_controller_test.rb
index 4318928..e39869f 100644
--- a/users/test/functional/users_controller_test.rb
+++ b/users/test/functional/users_controller_test.rb
@@ -32,6 +32,7 @@ class UsersControllerTest < ActionController::TestCase
 
   test "should get edit view" do
     user = stub_record User
+    User.expects(:find_by_param).with(user.id.to_s).returns(user)
     login user
     get :edit, :id => user.id
     assert_equal user, assigns[:user]
@@ -39,7 +40,8 @@ class UsersControllerTest < ActionController::TestCase
 
   test "should process updated params" do
     user = stub_record User
-    user.expects(:update).with(user.params).returns(user)
+    user.expects(:update_attributes).with(user.params).returns(true)
+    User.expects(:find_by_param).with(user.id.to_s).returns(user)
     login user
     post :update, :user => user.params, :id => user.id
     assert_equal user, assigns[:user]
diff --git a/users/test/unit/user_test.rb b/users/test/unit/user_test.rb
index f057ca7..92c1463 100644
--- a/users/test/unit/user_test.rb
+++ b/users/test/unit/user_test.rb
@@ -23,14 +23,14 @@ class UserTest < ActiveSupport::TestCase
     assert !@user.valid?
   end
 
-  test "find_by_param gets User by login" do
+  test "find_by_param gets User by id" do
     @user.save
-    assert_equal @user, User.find_by_param(@user.login)
+    assert_equal @user, User.find_by_param(@user.id)
     @user.destroy
   end
 
-  test "to_param gives user login" do
-    assert_equal @user.login, @user.to_param
+  test "to_param gives user id" do
+    assert_equal @user.id, @user.to_param
   end
 
   test "verifier returns number for the hex in password_verifier" do
-- 
cgit v1.2.3


From 595518684b9c4364f96c97a84cc481b5ae0da981 Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Mon, 26 Nov 2012 11:54:11 +0100
Subject: simplified controller and adjusted tests

Also added #assert_json_error to tests.
---
 users/test/functional/sessions_controller_test.rb  |  4 ++--
 users/test/functional/users_controller_test.rb     | 25 +++++++++++-----------
 users/test/support/stub_record_helper.rb           |  1 +
 users/test/unit/user_test.rb                       |  1 +
 .../warden_strategy_secure_remote_password_test.rb |  4 ++--
 5 files changed, 18 insertions(+), 17 deletions(-)

(limited to 'users/test')

diff --git a/users/test/functional/sessions_controller_test.rb b/users/test/functional/sessions_controller_test.rb
index 93cc032..9df4455 100644
--- a/users/test/functional/sessions_controller_test.rb
+++ b/users/test/functional/sessions_controller_test.rb
@@ -22,7 +22,7 @@ class SessionsControllerTest < ActionController::TestCase
     request.env['warden'].expects(:winning_strategy)
     get :new, :format => :json
     assert_response :success
-    assert_json_response :errors => nil
+    assert_json_error nil
   end
 
   test "renders warden errors" do
@@ -31,7 +31,7 @@ class SessionsControllerTest < ActionController::TestCase
     I18n.expects(:t).with(:translate_me).at_least_once.returns("translation stub")
     get :new, :format => :json
     assert_response 422
-    assert_json_response :errors => {"field" => "translation stub"}
+    assert_json_error :field => "translation stub"
   end
 
   # Warden takes care of parsing the params and
diff --git a/users/test/functional/users_controller_test.rb b/users/test/functional/users_controller_test.rb
index e39869f..ced8ee9 100644
--- a/users/test/functional/users_controller_test.rb
+++ b/users/test/functional/users_controller_test.rb
@@ -11,23 +11,22 @@ class UsersControllerTest < ActionController::TestCase
 
   test "should create new user" do
     user = stub_record User
-    User.expects(:create!).with(user.params).returns(user)
-    post :create, :user => user.params
+    User.expects(:create).with(user.params).returns(user)
+    post :create, :user => user.params, :format => :json
     assert_nil session[:user_id]
-    assert_response :redirect
-    assert_redirected_to root_url
+    assert_json_response user
+    assert_response :success
   end
 
   test "should redirect to signup form on failed attempt" do
     params = User.valid_attributes_hash.slice(:login)
     user = User.new(params)
     params.stringify_keys!
-    User.expects(:create!).with(params).raises(VALIDATION_FAILED.new(user))
-    post :create, :user => params
-    assert_nil session[:user_id]
-    assert_equal user, assigns[:user]
-    assert_response :redirect
-    assert_redirected_to new_user_path
+    assert !user.valid?
+    User.expects(:create).with(params).returns(user)
+    post :create, :user => params, :format => :json
+    assert_json_error user.errors.messages
+    assert_response 422
   end
 
   test "should get edit view" do
@@ -43,9 +42,9 @@ class UsersControllerTest < ActionController::TestCase
     user.expects(:update_attributes).with(user.params).returns(true)
     User.expects(:find_by_param).with(user.id.to_s).returns(user)
     login user
-    post :update, :user => user.params, :id => user.id
+    put :update, :user => user.params, :id => user.id, :format => :json
     assert_equal user, assigns[:user]
-    assert_response :redirect
-    assert_redirected_to edit_user_path(user)
+    assert_equal " ", @response.body
+    assert_response 204
   end
 end
diff --git a/users/test/support/stub_record_helper.rb b/users/test/support/stub_record_helper.rb
index 95b9d63..e744ad7 100644
--- a/users/test/support/stub_record_helper.rb
+++ b/users/test/support/stub_record_helper.rb
@@ -10,6 +10,7 @@ module StubRecordHelper
     params.reverse_merge! :id => 123,
       :class => klass,
       :to_key => ['123'],
+      :to_json => %Q({"stub":"#{klass.name}"}),
       :new_record? => !persisted,
       :persisted? => persisted
     stub params
diff --git a/users/test/unit/user_test.rb b/users/test/unit/user_test.rb
index 92c1463..cce11c2 100644
--- a/users/test/unit/user_test.rb
+++ b/users/test/unit/user_test.rb
@@ -5,6 +5,7 @@ class UserTest < ActiveSupport::TestCase
   include SRP::Util
   setup do
     @attribs = User.valid_attributes_hash
+    User.find_by_login(@attribs[:login]).try(:destroy)
     @user = User.new(@attribs)
   end
 
diff --git a/users/test/unit/warden_strategy_secure_remote_password_test.rb b/users/test/unit/warden_strategy_secure_remote_password_test.rb
index 79480f0..319809a 100644
--- a/users/test/unit/warden_strategy_secure_remote_password_test.rb
+++ b/users/test/unit/warden_strategy_secure_remote_password_test.rb
@@ -32,7 +32,7 @@ class WardenStrategySecureRemotePasswordTest < ActiveSupport::TestCase
     User.expects(:find_by_param).with(unknown).raises(RECORD_NOT_FOUND)
     post :create, :login => unknown
     assert_response :success
-    assert_json_response :errors => {"login" => ["unknown user"]}
+    assert_json_error "login" => ["unknown user"]
   end
 
   test "should authorize" do
@@ -56,7 +56,7 @@ class WardenStrategySecureRemotePasswordTest < ActiveSupport::TestCase
     post :update, :id => @user.login, :client_auth => @client_hex
     assert_nil session[:handshake]
     assert_nil session[:user_id]
-    assert_json_response :errors => {"password" => ["wrong password"]}
+    assert_json_error "password" => ["wrong password"]
   end
 
 =end
-- 
cgit v1.2.3


From cdda8f095d49cdda94c3527ecb92cb15c300327b Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Mon, 26 Nov 2012 12:15:54 +0100
Subject: fixed login error message on wrong username

---
 users/test/integration/api/account_flow_test.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'users/test')

diff --git a/users/test/integration/api/account_flow_test.rb b/users/test/integration/api/account_flow_test.rb
index 4135485..add12fe 100644
--- a/users/test/integration/api/account_flow_test.rb
+++ b/users/test/integration/api/account_flow_test.rb
@@ -65,8 +65,8 @@ class AccountFlowTest < ActiveSupport::TestCase
   test "signup and wrong password login attempt" do
     srp = SRP::Client.new(@login, "wrong password")
     server_auth = srp.authenticate(self)
+    assert_json_error :password => "wrong password"
     assert !last_response.successful?
-    assert_equal "wrong password", server_auth["errors"]['password']
     assert_nil server_auth["M2"]
   end
 
@@ -76,6 +76,7 @@ class AccountFlowTest < ActiveSupport::TestCase
     assert_raises RECORD_NOT_FOUND do
       server_auth = srp.authenticate(self)
     end
+    assert_json_error :login => "could not be found"
     assert !last_response.successful?
     assert_nil server_auth
   end
-- 
cgit v1.2.3