diff options
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/support/test/functional/ticket_comments_test.rb | 6 | ||||
| -rw-r--r-- | engines/support/test/test_helper.rb | 16 |
2 files changed, 7 insertions, 15 deletions
diff --git a/engines/support/test/functional/ticket_comments_test.rb b/engines/support/test/functional/ticket_comments_test.rb index 5cbe233..c6c143a 100644 --- a/engines/support/test/functional/ticket_comments_test.rb +++ b/engines/support/test/functional/ticket_comments_test.rb @@ -1,4 +1,4 @@ -require 'test_helper' +require_relative '../test_helper' class TicketsCommentsTest < ActionController::TestCase tests TicketsController @@ -67,9 +67,9 @@ class TicketsCommentsTest < ActionController::TestCase test "admin add comment to authenticated ticket" do - - other_user = find_record :user login :is_admin? => true + admin = find_record :user, @current_user + other_user = find_record :user ticket = FactoryGirl.create :ticket, :created_by => other_user.id diff --git a/engines/support/test/test_helper.rb b/engines/support/test/test_helper.rb index 57cdd63..6c19721 100644 --- a/engines/support/test/test_helper.rb +++ b/engines/support/test/test_helper.rb @@ -1,14 +1,6 @@ -# Configure Rails Environment -ENV["RAILS_ENV"] = "test" - -require "rails/test_help" - -Rails.backtrace_cleaner.remove_silencers! - -# Load support files -Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f } +require_relative "../../../test/test_helper" # Load fixtures from the engine -if ActiveSupport::TestCase.method_defined?(:fixture_path=) - ActiveSupport::TestCase.fixture_path = File.expand_path("../fixtures", __FILE__) -end +#if ActiveSupport::TestCase.method_defined?(:fixture_path=) +# ActiveSupport::TestCase.fixture_path = File.expand_path("../fixtures", __FILE__) +#end |