summaryrefslogtreecommitdiffstats
path: root/test/fixtures
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2012-04-25 17:17:49 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2012-04-25 17:17:49 +0000
commit5e57a1a9d9478162ac4f27ae96b2ccaf55a1aba7 (patch)
tree93e57765139714bd82dede475725516c448c0d55 /test/fixtures
parent34e20c4373b7f5a20ab3a132feae3f70f21ec477 (diff)
downloadredmine-5e57a1a9d9478162ac4f27ae96b2ccaf55a1aba7.tar.gz
redmine-5e57a1a9d9478162ac4f27ae96b2ccaf55a1aba7.zip
Merged rails-3.2 branch.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9528 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test/fixtures')
-rw-r--r--test/fixtures/custom_fields.yml9
-rw-r--r--test/fixtures/repositories.yml4
2 files changed, 11 insertions, 2 deletions
diff --git a/test/fixtures/custom_fields.yml b/test/fixtures/custom_fields.yml
index b99de35a3..e114ffa00 100644
--- a/test/fixtures/custom_fields.yml
+++ b/test/fixtures/custom_fields.yml
@@ -143,3 +143,12 @@ custom_fields_010:
field_format: bool
default_value: 0
editable: true
+custom_fields_011:
+ id: 11
+ name: Binary
+ type: CustomField
+ possible_values:
+ - !binary |
+ SGXDqWzDp2prc2Tigqw2NTTDuQ==
+ - Other value
+ field_format: list
diff --git a/test/fixtures/repositories.yml b/test/fixtures/repositories.yml
index ef7285f61..5be709a1d 100644
--- a/test/fixtures/repositories.yml
+++ b/test/fixtures/repositories.yml
@@ -6,7 +6,7 @@ repositories_001:
root_url: file:///<%= Rails.root %>/tmp/test/subversion_repository
password: ""
login: ""
- type: Subversion
+ type: Repository::Subversion
is_default: true
repositories_002:
project_id: 2
@@ -15,5 +15,5 @@ repositories_002:
root_url: svn://localhost
password: ""
login: ""
- type: Subversion
+ type: Repository::Subversion
is_default: true