summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/lib/extensions/testing.rb12
-rw-r--r--users/app/controllers/users_controller.rb9
-rw-r--r--users/test/functional/sessions_controller_test.rb4
-rw-r--r--users/test/functional/users_controller_test.rb25
-rw-r--r--users/test/support/stub_record_helper.rb1
-rw-r--r--users/test/unit/user_test.rb1
-rw-r--r--users/test/unit/warden_strategy_secure_remote_password_test.rb4
7 files changed, 31 insertions, 25 deletions
diff --git a/core/lib/extensions/testing.rb b/core/lib/extensions/testing.rb
index 86a059f..925c023 100644
--- a/core/lib/extensions/testing.rb
+++ b/core/lib/extensions/testing.rb
@@ -15,10 +15,18 @@ module LeapWebCore
end
def assert_json_response(object)
- object.stringify_keys! if object.respond_to? :stringify_keys!
- assert_equal object, JSON.parse(get_response.body)
+ if object.is_a? Hash
+ object.stringify_keys! if object.respond_to? :stringify_keys!
+ assert_equal object, JSON.parse(get_response.body)
+ else
+ assert_equal object.to_json, get_response.body
+ end
end
+ def assert_json_error(object)
+ object.stringify_keys! if object.respond_to? :stringify_keys!
+ assert_json_response :errors => object
+ end
end
end
diff --git a/users/app/controllers/users_controller.rb b/users/app/controllers/users_controller.rb
index 3913d0d..5be1fa9 100644
--- a/users/app/controllers/users_controller.rb
+++ b/users/app/controllers/users_controller.rb
@@ -11,11 +11,8 @@ class UsersController < ApplicationController
end
def create
- @user = User.create!(params[:user])
- respond_with(@user, :location => root_url, :notice => "Signed up!")
- rescue VALIDATION_FAILED => e
- @user = e.document
- respond_with(@user, :location => new_user_path)
+ @user = User.create(params[:user])
+ respond_with @user
end
def edit
@@ -23,7 +20,7 @@ class UsersController < ApplicationController
def update
@user.update_attributes(params[:user])
- respond_with(@user, :location => edit_user_path(@user))
+ respond_with @user
end
protected
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