From b2230076ed045f82b09707d746c17e4b9d4834e7 Mon Sep 17 00:00:00 2001 From: Vasiliy Ermolovich Date: Sat, 17 Dec 2011 13:57:43 +0300 Subject: [PATCH] fix warnings in tests --- test/support/mock_controller.rb | 2 +- test/support/models.rb | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/test/support/mock_controller.rb b/test/support/mock_controller.rb index ed608795..4c7e06d5 100644 --- a/test/support/mock_controller.rb +++ b/test/support/mock_controller.rb @@ -6,7 +6,7 @@ class MockController end def action_name - @action_name || "edit" + defined?(@action_name) ? @action_name : "edit" end def url_for(*args) diff --git a/test/support/models.rb b/test/support/models.rb index de3888f5..8d69f90b 100644 --- a/test/support/models.rb +++ b/test/support/models.rb @@ -45,6 +45,7 @@ class User :post_count, :lock_version, :amount, :attempts, :action, :credit_card def initialize(options={}) + @new_record = false options.each do |key, value| send("#{key}=", value) end if options @@ -55,7 +56,7 @@ class User end def persisted? - !(@new_record || false) + !@new_record end def company_attributes=(*)