summaryrefslogtreecommitdiff
path: root/users/test/support
diff options
context:
space:
mode:
authorjessib <jessib@leap.se>2012-12-07 10:31:12 -0800
committerjessib <jessib@leap.se>2012-12-07 10:31:12 -0800
commite1a004e2b24c2c235452469abfefa033e24435b2 (patch)
treea4b1c89a5aa4d5ccb3c17521499c999dedd5842d /users/test/support
parent4793c2b770fcb018303b7ab226b75cc218364327 (diff)
parent8282b83c798ba4e5c1e26ec8243b82669b3ee6d4 (diff)
Merge branch 'master' into help_develop
Conflicts: app/views/layouts/application.html.haml help/app/controllers/tickets_controller.rb help/test/functional/tickets_controller_test.rb users/test/support/stub_record_helper.rb
Diffstat (limited to 'users/test/support')
-rw-r--r--users/test/support/auth_test_helper.rb17
-rw-r--r--users/test/support/stub_record_helper.rb26
2 files changed, 26 insertions, 17 deletions
diff --git a/users/test/support/auth_test_helper.rb b/users/test/support/auth_test_helper.rb
index 99dc141..6a82f24 100644
--- a/users/test/support/auth_test_helper.rb
+++ b/users/test/support/auth_test_helper.rb
@@ -10,8 +10,8 @@ module AuthTestHelper
end
end
- def login(user_or_method_hash = nil)
- @current_user = stub_user(user_or_method_hash)
+ def login(user_or_method_hash = {})
+ @current_user = stub_record(User, user_or_method_hash)
unless @current_user.respond_to? :is_admin?
@current_user.stubs(:is_admin?).returns(false)
end
@@ -30,19 +30,6 @@ module AuthTestHelper
end
end
- protected
-
- # Will create a stub user for logging in from either
- # * a hash of methods to stub
- # * a user record
- # * nil -> create a user record stub
- def stub_user(user_or_method_hash)
- if user_or_method_hash.is_a?(Hash)
- stub_record User, user_or_method_hash
- else
- user_or_method_hash || stub_record(User)
- end
- end
end
class ActionController::TestCase
diff --git a/users/test/support/stub_record_helper.rb b/users/test/support/stub_record_helper.rb
index ede21cf..2e1a533 100644
--- a/users/test/support/stub_record_helper.rb
+++ b/users/test/support/stub_record_helper.rb
@@ -1,19 +1,41 @@
module StubRecordHelper
+ # Will expect find_by_param or find_by_id to be called on klass and
+ # return the record given.
+ # If no record is given but a hash or nil will create a stub based on
+ # that instead and returns the stub.
+ def find_record(klass, record_or_method_hash = {})
+ record = stub_record(klass, record_or_method_hash)
+ finder = klass.respond_to?(:find_by_param) ? :find_by_param : :find_by_id
+ klass.expects(finder).with(record.to_param).returns(record)
+ return record
+ end
+
# 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 the second parameter is a record we return the record itself.
+ # This way you can build functions that either take a record or a
+ # method hash to stub from. See find_record for an example.
+ def stub_record(klass, record_or_method_hash = {}, persisted = true)
+ if record_or_method_hash && !record_or_method_hash.is_a?(Hash)
+ return record_or_method_hash
+ end
+ stub record_params_for(klass, record_or_method_hash, persisted)
+ end
+
+ def record_params_for(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 => "A123",
+ :to_param => "A123",
:class => klass,
:to_key => ['123'],
:to_json => %Q({"stub":"#{klass.name}"}),
:new_record? => !persisted,
:persisted? => persisted
- stub params
end
end