From f86d4940e11f541cbb5244848025dad471457649 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sat, 20 Dec 2014 14:22:50 +0000 Subject: [PATCH] Removed that quote in a fixture subject. git-svn-id: http://svn.redmine.org/redmine/trunk@13775 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- test/fixtures/issues.yml | 2 +- test/functional/activities_controller_test.rb | 4 ++-- test/functional/issues_controller_test.rb | 12 ++++++------ test/unit/helpers/application_helper_test.rb | 2 +- test/unit/helpers/issues_helper_test.rb | 8 ++++---- test/unit/issue_test.rb | 2 +- test/unit/mailer_test.rb | 6 +++--- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/test/fixtures/issues.yml b/test/fixtures/issues.yml index 8eb8ae1a5..fb2216b9c 100644 --- a/test/fixtures/issues.yml +++ b/test/fixtures/issues.yml @@ -4,7 +4,7 @@ issues_001: project_id: 1 updated_on: <%= 1.day.ago.to_s(:db) %> priority_id: 4 - subject: Can't print recipes + subject: Cannot print recipes id: 1 fixed_version_id: category_id: 1 diff --git a/test/functional/activities_controller_test.rb b/test/functional/activities_controller_test.rb index 2a9af2d95..bfac75f5d 100644 --- a/test/functional/activities_controller_test.rb +++ b/test/functional/activities_controller_test.rb @@ -51,7 +51,7 @@ class ActivitiesControllerTest < ActionController::TestCase assert_not_nil assigns(:events_by_day) assert_select 'h3', :text => /#{3.days.ago.to_date.day}/ - assert_select 'dl dt.issue a', :text => /#{ESCAPED_UCANT} print recipes/ + assert_select 'dl dt.issue a', :text => /Cannot print recipes/ end def test_global_index @@ -81,7 +81,7 @@ class ActivitiesControllerTest < ActionController::TestCase d1 = User.find(1).time_to_date(i1.created_on) assert_select 'h3', :text => /#{d1.day}/ - assert_select 'dl dt.issue a', :text => /#{ESCAPED_UCANT} print recipes/ + assert_select 'dl dt.issue a', :text => /Cannot print recipes/ end def test_user_index_with_invalid_user_id_should_respond_404 diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb index 25829e733..9f6107c89 100644 --- a/test/functional/issues_controller_test.rb +++ b/test/functional/issues_controller_test.rb @@ -60,7 +60,7 @@ class IssuesControllerTest < ActionController::TestCase assert_nil assigns(:project) # links to visible issues - assert_select 'a[href="/issues/1"]', :text => /#{ESCAPED_UCANT} print recipes/ + assert_select 'a[href="/issues/1"]', :text => /Cannot print recipes/ assert_select 'a[href="/issues/5"]', :text => /Subproject issue/ # private projects hidden assert_select 'a[href="/issues/6"]', 0 @@ -96,7 +96,7 @@ class IssuesControllerTest < ActionController::TestCase assert_template 'index' assert_not_nil assigns(:issues) - assert_select 'a[href="/issues/1"]', :text => /#{ESCAPED_UCANT} print recipes/ + assert_select 'a[href="/issues/1"]', :text => /Cannot print recipes/ assert_select 'a[href="/issues/5"]', 0 end @@ -107,7 +107,7 @@ class IssuesControllerTest < ActionController::TestCase assert_template 'index' assert_not_nil assigns(:issues) - assert_select 'a[href="/issues/1"]', :text => /#{ESCAPED_UCANT} print recipes/ + assert_select 'a[href="/issues/1"]', :text => /Cannot print recipes/ assert_select 'a[href="/issues/5"]', :text => /Subproject issue/ assert_select 'a[href="/issues/6"]', 0 end @@ -120,7 +120,7 @@ class IssuesControllerTest < ActionController::TestCase assert_template 'index' assert_not_nil assigns(:issues) - assert_select 'a[href="/issues/1"]', :text => /#{ESCAPED_UCANT} print recipes/ + assert_select 'a[href="/issues/1"]', :text => /Cannot print recipes/ assert_select 'a[href="/issues/5"]', :text => /Subproject issue/ assert_select 'a[href="/issues/6"]', :text => /Issue of a private subproject/ end @@ -900,7 +900,7 @@ class IssuesControllerTest < ActionController::TestCase assert_select 'textarea[name=?]', 'issue[notes]' end end - assert_select 'title', :text => "Bug #1: #{ESCAPED_UCANT} print recipes - eCookbook - Redmine" + assert_select 'title', :text => "Bug #1: Cannot print recipes - eCookbook - Redmine" end def test_show_by_manager @@ -2363,7 +2363,7 @@ class IssuesControllerTest < ActionController::TestCase :notes => 'just trying'} end issue = Issue.find(1) - assert_equal "Can't print recipes", issue.subject + assert_equal "Cannot print recipes", issue.subject assert_nil issue.assigned_to end diff --git a/test/unit/helpers/application_helper_test.rb b/test/unit/helpers/application_helper_test.rb index 369057890..27a7686e1 100644 --- a/test/unit/helpers/application_helper_test.rb +++ b/test/unit/helpers/application_helper_test.rb @@ -945,7 +945,7 @@ RAW result2 = link_to('#1', "/issues/1", :class => Issue.find(1).css_classes, - :title => "Can't print recipes (New)") + :title => "Cannot print recipes (New)") expected = <<-EXPECTED

#{result1}

diff --git a/test/unit/helpers/issues_helper_test.rb b/test/unit/helpers/issues_helper_test.rb index 273755338..cf681882c 100644 --- a/test/unit/helpers/issues_helper_test.rb +++ b/test/unit/helpers/issues_helper_test.rb @@ -215,9 +215,9 @@ class IssuesHelperTest < ActionView::TestCase detail = JournalDetail.new(:property => 'relation', :prop_key => 'precedes', :value => 1) - assert_equal "Precedes Bug #1: Can't print recipes added", show_detail(detail, true) + assert_equal "Precedes Bug #1: Cannot print recipes added", show_detail(detail, true) str = link_to("Bug #1", "/issues/1", :class => Issue.find(1).css_classes) - assert_equal "Precedes #{str}: #{ESCAPED_UCANT} print recipes added", + assert_equal "Precedes #{str}: Cannot print recipes added", show_detail(detail, false) end @@ -245,11 +245,11 @@ class IssuesHelperTest < ActionView::TestCase detail = JournalDetail.new(:property => 'relation', :prop_key => 'precedes', :old_value => 1) - assert_equal "Precedes deleted (Bug #1: Can't print recipes)", show_detail(detail, true) + assert_equal "Precedes deleted (Bug #1: Cannot print recipes)", show_detail(detail, true) str = link_to("Bug #1", "/issues/1", :class => Issue.find(1).css_classes) - assert_equal "Precedes deleted (#{str}: #{ESCAPED_UCANT} print recipes)", + assert_equal "Precedes deleted (#{str}: Cannot print recipes)", show_detail(detail, false) end diff --git a/test/unit/issue_test.rb b/test/unit/issue_test.rb index 2ac08cec3..e4edb6acd 100644 --- a/test/unit/issue_test.rb +++ b/test/unit/issue_test.rb @@ -445,7 +445,7 @@ class IssueTest < ActiveSupport::TestCase assert !issue.save issue.reload - assert_equal "Can't print recipes", issue.subject + assert_equal "Cannot print recipes", issue.subject end def test_should_not_recreate_custom_values_objects_on_update diff --git a/test/unit/mailer_test.rb b/test/unit/mailer_test.rb index 68e3c343f..0ad47e99e 100644 --- a/test/unit/mailer_test.rb +++ b/test/unit/mailer_test.rb @@ -56,7 +56,7 @@ class MailerTest < ActiveSupport::TestCase # link to a referenced ticket assert_select 'a[href=?][title=?]', 'https://mydomain.foo/issues/1', - "#{ESCAPED_UCANT} print recipes (New)", + "Cannot print recipes (New)", :text => '#1' # link to a changeset assert_select 'a[href=?][title=?]', @@ -95,7 +95,7 @@ class MailerTest < ActiveSupport::TestCase # link to a referenced ticket assert_select 'a[href=?][title=?]', 'http://mydomain.foo/rdm/issues/1', - "#{ESCAPED_UCANT} print recipes (New)", + "Cannot print recipes (New)", :text => '#1' # link to a changeset assert_select 'a[href=?][title=?]', @@ -145,7 +145,7 @@ class MailerTest < ActiveSupport::TestCase # link to a referenced ticket assert_select 'a[href=?][title=?]', 'http://mydomain.foo/rdm/issues/1', - "#{ESCAPED_UCANT} print recipes (New)", + "Cannot print recipes (New)", :text => '#1' # link to a changeset assert_select 'a[href=?][title=?]', -- 2.39.5