diff options
| author | Go MAEDA <maeda@farend.jp> | 2018-11-03 07:15:00 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2018-11-03 07:15:00 +0000 |
| commit | 46b028b1b87a3e06df19e1c41f9240d301568967 (patch) | |
| tree | 11393f0d0cc2058ce65f40aac64d62caa501e2ed | |
| parent | dced4762005be491000490fc4c9661d0415272f7 (diff) | |
| download | redmine-46b028b1b87a3e06df19e1c41f9240d301568967.tar.gz redmine-46b028b1b87a3e06df19e1c41f9240d301568967.zip | |
Fix that the following tests fail randomly due to uninitialized User.current (#29853):
* AttachmentsVisibilityTest#test_attachment_should_be_visible
*
Redmine::AttachmentFieldFormatTest#test_should_accept_a_hash_with_upload_on_create
*
Redmine::AttachmentFieldFormatTest#test_should_replace_attachment_on_update
Patch by Gilad Shanan.
git-svn-id: http://svn.redmine.org/redmine/trunk@17616 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | test/functional/attachments_visibility_test.rb | 1 | ||||
| -rw-r--r-- | test/integration/api_test/authentication_test.rb | 4 | ||||
| -rw-r--r-- | test/integration/lib/redmine/field_format/attachment_format_test.rb | 1 |
3 files changed, 6 insertions, 0 deletions
diff --git a/test/functional/attachments_visibility_test.rb b/test/functional/attachments_visibility_test.rb index 96230e8b2..2f9197e6b 100644 --- a/test/functional/attachments_visibility_test.rb +++ b/test/functional/attachments_visibility_test.rb @@ -26,6 +26,7 @@ class AttachmentsVisibilityTest < Redmine::ControllerTest :issues, :trackers, :versions def setup + User.current = nil set_tmp_attachments_directory @field = IssueCustomField.generate!(:field_format => 'attachment', :visible => true) diff --git a/test/integration/api_test/authentication_test.rb b/test/integration/api_test/authentication_test.rb index 678ee98f5..f1c2e9e79 100644 --- a/test/integration/api_test/authentication_test.rb +++ b/test/integration/api_test/authentication_test.rb @@ -20,6 +20,10 @@ require File.expand_path('../../../test_helper', __FILE__) class Redmine::ApiTest::AuthenticationTest < Redmine::ApiTest::Base fixtures :users + def teardown + User.current = nil + end + def test_api_should_deny_without_credentials get '/users/current.xml' assert_response 401 diff --git a/test/integration/lib/redmine/field_format/attachment_format_test.rb b/test/integration/lib/redmine/field_format/attachment_format_test.rb index 958b25769..a01149d01 100644 --- a/test/integration/lib/redmine/field_format/attachment_format_test.rb +++ b/test/integration/lib/redmine/field_format/attachment_format_test.rb @@ -35,6 +35,7 @@ class AttachmentFieldFormatTest < Redmine::IntegrationTest :attachments def setup + User.current = nil set_tmp_attachments_directory @field = IssueCustomField.generate!(:name => "File", :field_format => "attachment") log_user "jsmith", "jsmith" |