diff options
| author | Go MAEDA <maeda@farend.jp> | 2019-06-08 06:44:20 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2019-06-08 06:44:20 +0000 |
| commit | 299f7a40b79e4e3c37711205f70fd847b4c7cde2 (patch) | |
| tree | 0abfef50c08e59d66adf1a287ada2c14bce6fd72 /test/integration | |
| parent | a12a6f6c3ec9634ee5f2a00a0db10b9966aaa8fc (diff) | |
| download | redmine-299f7a40b79e4e3c37711205f70fd847b4c7cde2.tar.gz redmine-299f7a40b79e4e3c37711205f70fd847b4c7cde2.zip | |
ApiTest fails if config.time_zone is set (#31388).
Patch by Yuichi HARADA.
git-svn-id: http://svn.redmine.org/redmine/trunk@18237 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test/integration')
| -rw-r--r-- | test/integration/api_test/api_test.rb | 4 | ||||
| -rw-r--r-- | test/integration/api_test/issues_test.rb | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/test/integration/api_test/api_test.rb b/test/integration/api_test/api_test.rb index 37affe934..8b0d9c31b 100644 --- a/test/integration/api_test/api_test.rb +++ b/test/integration/api_test/api_test.rb @@ -40,12 +40,12 @@ class Redmine::ApiTest::ApiTest < Redmine::ApiTest::Base def test_json_datetime_format get '/users/1.json', :headers => credentials('admin') - assert_include '"created_on":"2006-07-19T17:12:21Z"', response.body + assert_include %Q|"created_on":"#{Time.zone.parse('2006-07-19T17:12:21Z').iso8601}"|, response.body end def test_xml_datetime_format get '/users/1.xml', :headers => credentials('admin') - assert_include '<created_on>2006-07-19T17:12:21Z</created_on>', response.body + assert_include "<created_on>#{Time.zone.parse('2006-07-19T17:12:21Z').iso8601}</created_on>", response.body end def test_head_response_should_have_empty_body diff --git a/test/integration/api_test/issues_test.rb b/test/integration/api_test/issues_test.rb index c5bf86744..516221801 100644 --- a/test/integration/api_test/issues_test.rb +++ b/test/integration/api_test/issues_test.rb @@ -211,10 +211,10 @@ class Redmine::ApiTest::IssuesTest < Redmine::ApiTest::Base test "GET /issues/:id.xml with journals should format timestamps in ISO 8601" do get '/issues/1.xml?include=journals' - iso_date = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z$/ - assert_select 'issue>created_on', :text => iso_date - assert_select 'issue>updated_on', :text => iso_date - assert_select 'issue journal>created_on', :text => iso_date + issue = Issue.find(1) + assert_select 'issue>created_on', :text => issue.created_on.iso8601 + assert_select 'issue>updated_on', :text => issue.updated_on.iso8601 + assert_select 'issue journal>created_on', :text => issue.journals[0].created_on.iso8601 end test "GET /issues/:id.xml with custom fields" do |