jro_apps/redmine Commit - r9906:8088749f10e4

Fixed tests broken by r10088....

Jean-Philippe Lang -

r9906:8088749f10e4

parent child

Context file:

r9906:8088749f10e4

Collapse all files

test/unit/lib/redmine/views/builders/json_test.rb +1 -1

             # Redmine - project management software
             # Copyright (C) 2006-2012  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.expand_path('../../../../../../test_helper', __FILE__)
             class Redmine::Views::Builders::JsonTest < ActiveSupport::TestCase
               def test_hash
                 assert_json_output({'person' => {'name' => 'Ryan', 'age' => 32}}) do |b|
                   b.person do
                     b.name 'Ryan'
                     b.age  32
                   end
                 end
               end
               def test_hash_hash
                 assert_json_output({'person' => {'name' => 'Ryan', 'birth' => {'city' => 'London', 'country' => 'UK'}}}) do |b|
                   b.person do
                     b.name 'Ryan'
                     b.birth :city => 'London', :country => 'UK'
                   end
                 end
                 assert_json_output({'person' => {'id' => 1, 'name' => 'Ryan', 'birth' => {'city' => 'London', 'country' => 'UK'}}}) do |b|
                   b.person :id => 1 do
                     b.name 'Ryan'
                     b.birth :city => 'London', :country => 'UK'
                   end
                 end
               end
               def test_array
                 assert_json_output({'books' => [{'title' => 'Book 1', 'author' => 'B. Smith'}, {'title' => 'Book 2', 'author' => 'G. Cooper'}]}) do |b|
                   b.array :books do |b|
                     b.book :title => 'Book 1', :author => 'B. Smith'
                     b.book :title => 'Book 2', :author => 'G. Cooper'
                   end
                 end
                 assert_json_output({'books' => [{'title' => 'Book 1', 'author' => 'B. Smith'}, {'title' => 'Book 2', 'author' => 'G. Cooper'}]}) do |b|
                   b.array :books do |b|
                     b.book :title => 'Book 1' do
                       b.author 'B. Smith'
                     end
                     b.book :title => 'Book 2' do
                       b.author 'G. Cooper'
                     end
                   end
                 end
               end
               def test_array_with_content_tags
                 assert_json_output({'books' => [{'value' => 'Book 1', 'author' => 'B. Smith'}, {'value' => 'Book 2', 'author' => 'G. Cooper'}]}) do |b|
                   b.array :books do |b|
                     b.book 'Book 1', :author => 'B. Smith'
                     b.book 'Book 2', :author => 'G. Cooper'
                   end
                 end
               end
               def test_nested_arrays
                 assert_json_output({'books' => [{'authors' => ['B. Smith', 'G. Cooper']}]}) do |b|
                   b.array :books do |books|
                     books.book do |book|
                       book.array :authors do |authors|
                         authors.author 'B. Smith'
                         authors.author 'G. Cooper'
                       end
                     end
                   end
                 end
               end
               def assert_json_output(expected, &block)
-                builder = Redmine::Views::Builders::Json.new
+                builder = Redmine::Views::Builders::Json.new(ActionDispatch::TestRequest.new, ActionDispatch::TestResponse.new)
                 block.call(builder)
                 assert_equal(expected, ActiveSupport::JSON.decode(builder.output))
               end
             end

test/unit/lib/redmine/views/builders/xml_test.rb +1 -1

             # Redmine - project management software
             # Copyright (C) 2006-2012  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.expand_path('../../../../../../test_helper', __FILE__)
             class Redmine::Views::Builders::XmlTest < ActiveSupport::TestCase
               def test_hash
                 assert_xml_output('<person><name>Ryan</name><age>32</age></person>') do |b|
                   b.person do
                     b.name 'Ryan'
                     b.age  32
                   end
                 end
               end
               def test_array
                 assert_xml_output('<books type="array"><book title="Book 1"/><book title="Book 2"/></books>') do |b|
                   b.array :books do |b|
                     b.book :title => 'Book 1'
                     b.book :title => 'Book 2'
                   end
                 end
               end
               def test_array_with_content_tags
                 assert_xml_output('<books type="array"><book author="B. Smith">Book 1</book><book author="G. Cooper">Book 2</book></books>') do |b|
                   b.array :books do |b|
                     b.book 'Book 1', :author => 'B. Smith'
                     b.book 'Book 2', :author => 'G. Cooper'
                   end
                 end
               end
               def test_nested_arrays
                 assert_xml_output('<books type="array"><book><authors type="array"><author>B. Smith</author><author>G. Cooper</author></authors></book></books>') do |b|
                   b.array :books do |books|
                     books.book do |book|
                       book.array :authors do |authors|
                         authors.author 'B. Smith'
                         authors.author 'G. Cooper'
                       end
                     end
                   end
                 end
               end
               def assert_xml_output(expected, &block)
-                builder = Redmine::Views::Builders::Xml.new
+                builder = Redmine::Views::Builders::Xml.new(ActionDispatch::TestRequest.new, ActionDispatch::TestResponse.new)
                 block.call(builder)
                 assert_equal('<?xml version="1.0" encoding="UTF-8"?>' + expected, builder.output)
               end
             end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages