diff --git a/test/integration/api_test/time_entries_test.rb b/test/integration/api_test/time_entries_test.rb index ce28c5dda..f42a1925f 100644 --- a/test/integration/api_test/time_entries_test.rb +++ b/test/integration/api_test/time_entries_test.rb @@ -1,16 +1,16 @@ # Redmine - project management software -# Copyright (C) 2006-2010 Jean-Philippe Lang +# Copyright (C) 2006-2011 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. @@ -19,11 +19,11 @@ require File.expand_path('../../../test_helper', __FILE__) class ApiTest::TimeEntriesTest < ActionController::IntegrationTest fixtures :all - + def setup Setting.rest_api_enabled = '1' end - + context "GET /time_entries.xml" do should "return time entries" do get '/time_entries.xml', {}, :authorization => credentials('jsmith') @@ -32,7 +32,7 @@ class ApiTest::TimeEntriesTest < ActionController::IntegrationTest assert_tag :tag => 'time_entries', :child => {:tag => 'time_entry', :child => {:tag => 'id', :content => '2'}} end - + context "with limit" do should "return limited results" do get '/time_entries.xml?limit=2', {}, :authorization => credentials('jsmith') @@ -43,7 +43,7 @@ class ApiTest::TimeEntriesTest < ActionController::IntegrationTest end end end - + context "GET /time_entries/2.xml" do should "return requested time entry" do get '/time_entries/2.xml', {}, :authorization => credentials('jsmith') @@ -53,7 +53,7 @@ class ApiTest::TimeEntriesTest < ActionController::IntegrationTest :child => {:tag => 'id', :content => '2'} end end - + context "POST /time_entries.xml" do context "with issue_id" do should "return create time entry" do @@ -62,7 +62,7 @@ class ApiTest::TimeEntriesTest < ActionController::IntegrationTest end assert_response :created assert_equal 'application/xml', @response.content_type - + entry = TimeEntry.first(:order => 'id DESC') assert_equal 'jsmith', entry.user.login assert_equal Issue.find(1), entry.issue @@ -72,7 +72,7 @@ class ApiTest::TimeEntriesTest < ActionController::IntegrationTest assert_equal TimeEntryActivity.find(11), entry.activity end end - + context "with project_id" do should "return create time entry" do assert_difference 'TimeEntry.count' do @@ -80,7 +80,7 @@ class ApiTest::TimeEntriesTest < ActionController::IntegrationTest end assert_response :created assert_equal 'application/xml', @response.content_type - + entry = TimeEntry.first(:order => 'id DESC') assert_equal 'jsmith', entry.user.login assert_nil entry.issue @@ -90,7 +90,7 @@ class ApiTest::TimeEntriesTest < ActionController::IntegrationTest assert_equal TimeEntryActivity.find(11), entry.activity end end - + context "with invalid parameters" do should "return errors" do assert_no_difference 'TimeEntry.count' do @@ -103,7 +103,7 @@ class ApiTest::TimeEntriesTest < ActionController::IntegrationTest end end end - + context "PUT /time_entries/2.xml" do context "with valid parameters" do should "update time entry" do @@ -127,7 +127,7 @@ class ApiTest::TimeEntriesTest < ActionController::IntegrationTest end end end - + context "DELETE /time_entries/2.xml" do should "destroy time entry" do assert_difference 'TimeEntry.count', -1 do @@ -137,7 +137,7 @@ class ApiTest::TimeEntriesTest < ActionController::IntegrationTest assert_nil TimeEntry.find_by_id(2) end end - + def credentials(user, password=nil) ActionController::HttpAuthentication::Basic.encode_credentials(user, password || user) end