summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2015-01-24 11:27:28 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2015-01-24 11:27:28 +0000
commitb50fa8fec19b9710db905439eddeac90e9bbe4b9 (patch)
treece8464c8f081a5300b7820a04676e1ff3da779fe /test
parent91967554b93f2477ca13e9389dd6379b50922dd6 (diff)
downloadredmine-b50fa8fec19b9710db905439eddeac90e9bbe4b9.tar.gz
redmine-b50fa8fec19b9710db905439eddeac90e9bbe4b9.zip
Fixed attachment fixture (should be attached to issue 3 because one of its journals references it), r13937.
git-svn-id: http://svn.redmine.org/redmine/trunk@13942 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test')
-rw-r--r--test/fixtures/attachments.yml2
-rw-r--r--test/functional/attachments_controller_test.rb8
-rw-r--r--test/integration/api_test/issues_test.rb8
3 files changed, 9 insertions, 9 deletions
diff --git a/test/fixtures/attachments.yml b/test/fixtures/attachments.yml
index d50d0357a..9437ed102 100644
--- a/test/fixtures/attachments.yml
+++ b/test/fixtures/attachments.yml
@@ -42,7 +42,7 @@ attachments_003:
attachments_004:
created_on: 2006-07-19 21:07:27 +02:00
container_type: Issue
- container_id: 3
+ container_id: 2
downloads: 0
disk_filename: 060719210727_source.rb
disk_directory: "2006/07"
diff --git a/test/functional/attachments_controller_test.rb b/test/functional/attachments_controller_test.rb
index 5cb8387a8..efd537599 100644
--- a/test/functional/attachments_controller_test.rb
+++ b/test/functional/attachments_controller_test.rb
@@ -329,15 +329,15 @@ class AttachmentsControllerTest < ActionController::TestCase
def test_edit
@request.session[:user_id] = 2
- get :edit, :object_type => 'issues', :object_id => '3'
+ get :edit, :object_type => 'issues', :object_id => '2'
assert_response :success
assert_template 'edit'
- container = Issue.find(3)
+ container = Issue.find(2)
assert_equal container, assigns(:container)
assert_equal container.attachments.size, assigns(:attachments).size
- assert_select 'form[action=?]', '/attachments/issues/3' do
+ assert_select 'form[action=?]', '/attachments/issues/2' do
assert_select 'tr#attachment-4' do
assert_select 'input[name=?][value=?]', 'attachments[4][filename]', 'source.rb'
assert_select 'input[name=?][value=?]', 'attachments[4][description]', 'This is a Ruby source file'
@@ -362,7 +362,7 @@ class AttachmentsControllerTest < ActionController::TestCase
def test_update
@request.session[:user_id] = 2
- patch :update, :object_type => 'issues', :object_id => '3', :attachments => {
+ patch :update, :object_type => 'issues', :object_id => '2', :attachments => {
'1' => {:filename => 'newname.text', :description => ''},
'4' => {:filename => 'newname.rb', :description => 'Renamed'},
}
diff --git a/test/integration/api_test/issues_test.rb b/test/integration/api_test/issues_test.rb
index 747ade2f4..78775eaed 100644
--- a/test/integration/api_test/issues_test.rb
+++ b/test/integration/api_test/issues_test.rb
@@ -280,10 +280,10 @@ class Redmine::ApiTest::IssuesTest < Redmine::ApiTest::Base
get '/issues/3.xml?include=attachments'
assert_select 'issue attachments[type=array]' do
- assert_select 'attachment', 5
- assert_select 'attachment id', :text => '4' do
- assert_select '~ filename', :text => 'source.rb'
- assert_select '~ content_url', :text => 'http://www.example.com/attachments/download/4/source.rb'
+ assert_select 'attachment', 4
+ assert_select 'attachment id', :text => '1' do
+ assert_select '~ filename', :text => 'error281.txt'
+ assert_select '~ content_url', :text => 'http://www.example.com/attachments/download/1/error281.txt'
end
end
end