From 46c0140a8eab632c783d309a7afd87cb7aad4280 Mon Sep 17 00:00:00 2001 From: Azul Date: Fri, 23 Nov 2012 10:55:49 +0100 Subject: refactored creation of record stubs --- users/test/support/auth_test_helper.rb | 3 +++ users/test/support/stub_record_helper.rb | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 users/test/support/stub_record_helper.rb (limited to 'users/test/support') 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 595518684b9c4364f96c97a84cc481b5ae0da981 Mon Sep 17 00:00:00 2001 From: Azul Date: Mon, 26 Nov 2012 11:54:11 +0100 Subject: simplified controller and adjusted tests Also added #assert_json_error to tests. --- users/test/support/stub_record_helper.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'users/test/support') 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 -- cgit v1.2.3