##// END OF EJS Templates
Fixed tests broken by r10088....
Jean-Philippe Lang -
r9906:8088749f10e4
parent child
Show More
@@ -1,94 +1,94
1 1 # Redmine - project management software
2 2 # Copyright (C) 2006-2012 Jean-Philippe Lang
3 3 #
4 4 # This program is free software; you can redistribute it and/or
5 5 # modify it under the terms of the GNU General Public License
6 6 # as published by the Free Software Foundation; either version 2
7 7 # of the License, or (at your option) any later version.
8 8 #
9 9 # This program is distributed in the hope that it will be useful,
10 10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 12 # GNU General Public License for more details.
13 13 #
14 14 # You should have received a copy of the GNU General Public License
15 15 # along with this program; if not, write to the Free Software
16 16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17 17
18 18 require File.expand_path('../../../../../../test_helper', __FILE__)
19 19
20 20 class Redmine::Views::Builders::JsonTest < ActiveSupport::TestCase
21 21
22 22 def test_hash
23 23 assert_json_output({'person' => {'name' => 'Ryan', 'age' => 32}}) do |b|
24 24 b.person do
25 25 b.name 'Ryan'
26 26 b.age 32
27 27 end
28 28 end
29 29 end
30 30
31 31 def test_hash_hash
32 32 assert_json_output({'person' => {'name' => 'Ryan', 'birth' => {'city' => 'London', 'country' => 'UK'}}}) do |b|
33 33 b.person do
34 34 b.name 'Ryan'
35 35 b.birth :city => 'London', :country => 'UK'
36 36 end
37 37 end
38 38
39 39 assert_json_output({'person' => {'id' => 1, 'name' => 'Ryan', 'birth' => {'city' => 'London', 'country' => 'UK'}}}) do |b|
40 40 b.person :id => 1 do
41 41 b.name 'Ryan'
42 42 b.birth :city => 'London', :country => 'UK'
43 43 end
44 44 end
45 45 end
46 46
47 47 def test_array
48 48 assert_json_output({'books' => [{'title' => 'Book 1', 'author' => 'B. Smith'}, {'title' => 'Book 2', 'author' => 'G. Cooper'}]}) do |b|
49 49 b.array :books do |b|
50 50 b.book :title => 'Book 1', :author => 'B. Smith'
51 51 b.book :title => 'Book 2', :author => 'G. Cooper'
52 52 end
53 53 end
54 54
55 55 assert_json_output({'books' => [{'title' => 'Book 1', 'author' => 'B. Smith'}, {'title' => 'Book 2', 'author' => 'G. Cooper'}]}) do |b|
56 56 b.array :books do |b|
57 57 b.book :title => 'Book 1' do
58 58 b.author 'B. Smith'
59 59 end
60 60 b.book :title => 'Book 2' do
61 61 b.author 'G. Cooper'
62 62 end
63 63 end
64 64 end
65 65 end
66 66
67 67 def test_array_with_content_tags
68 68 assert_json_output({'books' => [{'value' => 'Book 1', 'author' => 'B. Smith'}, {'value' => 'Book 2', 'author' => 'G. Cooper'}]}) do |b|
69 69 b.array :books do |b|
70 70 b.book 'Book 1', :author => 'B. Smith'
71 71 b.book 'Book 2', :author => 'G. Cooper'
72 72 end
73 73 end
74 74 end
75 75
76 76 def test_nested_arrays
77 77 assert_json_output({'books' => [{'authors' => ['B. Smith', 'G. Cooper']}]}) do |b|
78 78 b.array :books do |books|
79 79 books.book do |book|
80 80 book.array :authors do |authors|
81 81 authors.author 'B. Smith'
82 82 authors.author 'G. Cooper'
83 83 end
84 84 end
85 85 end
86 86 end
87 87 end
88 88
89 89 def assert_json_output(expected, &block)
90 builder = Redmine::Views::Builders::Json.new
90 builder = Redmine::Views::Builders::Json.new(ActionDispatch::TestRequest.new, ActionDispatch::TestResponse.new)
91 91 block.call(builder)
92 92 assert_equal(expected, ActiveSupport::JSON.decode(builder.output))
93 93 end
94 94 end
@@ -1,67 +1,67
1 1 # Redmine - project management software
2 2 # Copyright (C) 2006-2012 Jean-Philippe Lang
3 3 #
4 4 # This program is free software; you can redistribute it and/or
5 5 # modify it under the terms of the GNU General Public License
6 6 # as published by the Free Software Foundation; either version 2
7 7 # of the License, or (at your option) any later version.
8 8 #
9 9 # This program is distributed in the hope that it will be useful,
10 10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 12 # GNU General Public License for more details.
13 13 #
14 14 # You should have received a copy of the GNU General Public License
15 15 # along with this program; if not, write to the Free Software
16 16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17 17
18 18 require File.expand_path('../../../../../../test_helper', __FILE__)
19 19
20 20 class Redmine::Views::Builders::XmlTest < ActiveSupport::TestCase
21 21
22 22 def test_hash
23 23 assert_xml_output('<person><name>Ryan</name><age>32</age></person>') do |b|
24 24 b.person do
25 25 b.name 'Ryan'
26 26 b.age 32
27 27 end
28 28 end
29 29 end
30 30
31 31 def test_array
32 32 assert_xml_output('<books type="array"><book title="Book 1"/><book title="Book 2"/></books>') do |b|
33 33 b.array :books do |b|
34 34 b.book :title => 'Book 1'
35 35 b.book :title => 'Book 2'
36 36 end
37 37 end
38 38 end
39 39
40 40 def test_array_with_content_tags
41 41 assert_xml_output('<books type="array"><book author="B. Smith">Book 1</book><book author="G. Cooper">Book 2</book></books>') do |b|
42 42 b.array :books do |b|
43 43 b.book 'Book 1', :author => 'B. Smith'
44 44 b.book 'Book 2', :author => 'G. Cooper'
45 45 end
46 46 end
47 47 end
48 48
49 49 def test_nested_arrays
50 50 assert_xml_output('<books type="array"><book><authors type="array"><author>B. Smith</author><author>G. Cooper</author></authors></book></books>') do |b|
51 51 b.array :books do |books|
52 52 books.book do |book|
53 53 book.array :authors do |authors|
54 54 authors.author 'B. Smith'
55 55 authors.author 'G. Cooper'
56 56 end
57 57 end
58 58 end
59 59 end
60 60 end
61 61
62 62 def assert_xml_output(expected, &block)
63 builder = Redmine::Views::Builders::Xml.new
63 builder = Redmine::Views::Builders::Xml.new(ActionDispatch::TestRequest.new, ActionDispatch::TestResponse.new)
64 64 block.call(builder)
65 65 assert_equal('<?xml version="1.0" encoding="UTF-8"?>' + expected, builder.output)
66 66 end
67 67 end
General Comments 0
You need to be logged in to leave comments. Login now