Upgrade to Rails 3.2.8 (#11758).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10275 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang committed 2012-09-02 10:08:51 +00:00
1 parent 139ddd639f
commit 265baa1b2c
18 files changed
+38 -38

No files matched your search

+1 -1
View File
@@ -1,6 +1,6 @@
source 'http://rubygems.org' source 'http://rubygems.org'
gem 'rails', '3.2.6' gem 'rails', '3.2.8'
gem "jquery-rails", "~> 2.0.2" gem "jquery-rails", "~> 2.0.2"
gem "i18n", "~> 0.6.0" gem "i18n", "~> 0.6.0"
gem "coderay", "~> 1.0.6" gem "coderay", "~> 1.0.6"
+1 -1
View File
@@ -1206,7 +1206,7 @@ module ApplicationHelper
# Returns the javascript tags that are included in the html layout head # Returns the javascript tags that are included in the html layout head
def javascript_heads def javascript_heads
tags = javascript_include_tag('jquery-1.7.2-ui-1.8.21-ujs-2.0.2', 'application') tags = javascript_include_tag('jquery-1.7.2-ui-1.8.21-ujs-2.0.3', 'application')
unless User.current.pref.warn_on_leaving_unsaved == '0' unless User.current.pref.warn_on_leaving_unsaved == '0'
tags << "\n".html_safe + javascript_tag("$(window).load(function(){ warnLeavingUnsaved('#{escape_javascript l(:text_warn_on_leaving_unsaved)}'); });") tags << "\n".html_safe + javascript_tag("$(window).load(function(){ warnLeavingUnsaved('#{escape_javascript l(:text_warn_on_leaving_unsaved)}'); });")
end end
+1 -1
View File
@@ -2,5 +2,5 @@
$('#tab-content-memberships').html('<%= escape_javascript(render :partial => 'groups/memberships') %>'); $('#tab-content-memberships').html('<%= escape_javascript(render :partial => 'groups/memberships') %>');
$('#member-<%= @membership.id %>').effect("highlight"); $('#member-<%= @membership.id %>').effect("highlight");
<% else %> <% else %>
alert('<%= escape_javascript(l(:notice_failed_to_save_members, :errors => @membership.errors.full_messages.join(', '))) %>'); alert('<%= raw(escape_javascript(l(:notice_failed_to_save_members, :errors => @membership.errors.full_messages.join(', ')))) %>');
<% end %> <% end %>
+1 -1
View File
@@ -7,5 +7,5 @@ hideOnLoad();
<% end %> <% end %>
<% else %> <% else %>
<% errors = @members.collect {|m| m.errors.full_messages}.flatten.uniq.join(', ') %> <% errors = @members.collect {|m| m.errors.full_messages}.flatten.uniq.join(', ') %>
alert('<%= escape_javascript l(:notice_failed_to_save_members, :errors => errors) %>'); alert('<%= raw(escape_javascript(l(:notice_failed_to_save_members, :errors => errors))) %>');
<% end %> <% end %>
@@ -3,5 +3,5 @@
$('#related-issue-<%= @issue.id %>').effect("highlight"); $('#related-issue-<%= @issue.id %>').effect("highlight");
$('#issue_id').focus(); $('#issue_id').focus();
<% else %> <% else %>
alert("<%= escape_javascript(l(:label_issue) + ' ' + l('activerecord.errors.messages.invalid')) %>"); alert("<%= raw(escape_javascript(l(:label_issue) + ' ' + l('activerecord.errors.messages.invalid'))) %>");
<% end %> <% end %>
+1 -1
View File
@@ -2,5 +2,5 @@
$('#tab-content-memberships').html('<%= escape_javascript(render :partial => 'users/memberships') %>'); $('#tab-content-memberships').html('<%= escape_javascript(render :partial => 'users/memberships') %>');
$("#member-<%= @membership.id %>").effect("highlight"); $("#member-<%= @membership.id %>").effect("highlight");
<% else %> <% else %>
alert('<%= escape_javascript l(:notice_failed_to_save_members, :errors => @membership.errors.full_messages.join(', ')) %>'); alert('<%= raw(escape_javascript(l(:notice_failed_to_save_members, :errors => @membership.errors.full_messages.join(', ')))) %>');
<% end %> <% end %>
@@ -129,5 +129,5 @@ jQuery.effects||function(a,b){function c(b){var c;return b&&b.constructor==Array
* Copyright (c) 2012 AUTHORS.txt; Licensed MIT, GPL */ * Copyright (c) 2012 AUTHORS.txt; Licensed MIT, GPL */
(function(a,b){a.effects.transfer=function(b){return this.queue(function(){var c=a(this),d=a(b.options.to),e=d.offset(),f={top:e.top,left:e.left,height:d.innerHeight(),width:d.innerWidth()},g=c.offset(),h=a('<div class="ui-effects-transfer"></div>').appendTo(document.body).addClass(b.options.className).css({top:g.top,left:g.left,height:c.innerHeight(),width:c.innerWidth(),position:"absolute"}).animate(f,b.duration,b.options.easing,function(){h.remove(),b.callback&&b.callback.apply(c[0],arguments),c.dequeue()})})}})(jQuery);; (function(a,b){a.effects.transfer=function(b){return this.queue(function(){var c=a(this),d=a(b.options.to),e=d.offset(),f={top:e.top,left:e.left,height:d.innerHeight(),width:d.innerWidth()},g=c.offset(),h=a('<div class="ui-effects-transfer"></div>').appendTo(document.body).addClass(b.options.className).css({top:g.top,left:g.left,height:c.innerHeight(),width:c.innerWidth(),position:"absolute"}).animate(f,b.duration,b.options.easing,function(){h.remove(),b.callback&&b.callback.apply(c[0],arguments),c.dequeue()})})}})(jQuery);;
/* JQuery UJS 2.0.2 */ /* JQuery UJS 2.0.3 */
(function(a,b){var c;a.rails=c={linkClickSelector:"a[data-confirm], a[data-method], a[data-remote], a[data-disable-with]",inputChangeSelector:"select[data-remote], input[data-remote], textarea[data-remote]",formSubmitSelector:"form",formInputClickSelector:"form input[type=submit], form input[type=image], form button[type=submit], form button:not(button[type])",disableSelector:"input[data-disable-with], button[data-disable-with], textarea[data-disable-with]",enableSelector:"input[data-disable-with]:disabled, button[data-disable-with]:disabled, textarea[data-disable-with]:disabled",requiredInputSelector:"input[name][required]:not([disabled]),textarea[name][required]:not([disabled])",fileInputSelector:"input:file",linkDisableSelector:"a[data-disable-with]",CSRFProtection:function(b){var c=a('meta[name="csrf-token"]').attr("content");if(c)b.setRequestHeader("X-CSRF-Token",c)},fire:function(b,c,d){var e=a.Event(c);b.trigger(e,d);return e.result!==false},confirm:function(a){return confirm(a)},ajax:function(b){return a.ajax(b)},href:function(a){return a.attr("href")},handleRemote:function(d){var e,f,g,h,i,j;if(c.fire(d,"ajax:before")){h=d.data("cross-domain")||null;i=d.data("type")||a.ajaxSettings&&a.ajaxSettings.dataType;if(d.is("form")){e=d.attr("method");f=d.attr("action");g=d.serializeArray();var k=d.data("ujs:submit-button");if(k){g.push(k);d.data("ujs:submit-button",null)}}else if(d.is(c.inputChangeSelector)){e=d.data("method");f=d.data("url");g=d.serialize();if(d.data("params"))g=g+"&"+d.data("params")}else{e=d.data("method");f=c.href(d);g=d.data("params")||null}j={type:e||"GET",data:g,dataType:i,crossDomain:h,beforeSend:function(a,e){if(e.dataType===b){a.setRequestHeader("accept","*/*;q=0.5, "+e.accepts.script)}return c.fire(d,"ajax:beforeSend",[a,e])},success:function(a,b,c){d.trigger("ajax:success",[a,b,c])},complete:function(a,b){d.trigger("ajax:complete",[a,b])},error:function(a,b,c){d.trigger("ajax:error",[a,b,c])}};if(f){j.url=f}return c.ajax(j)}else{return false}},handleMethod:function(d){var e=c.href(d),f=d.data("method"),g=d.attr("target"),h=a("meta[name=csrf-token]").attr("content"),i=a("meta[name=csrf-param]").attr("content"),j=a('<form method="post" action="'+e+'"></form>'),k='<input name="_method" value="'+f+'" type="hidden" />';if(i!==b&&h!==b){k+='<input name="'+i+'" value="'+h+'" type="hidden" />'}if(g){j.attr("target",g)}j.hide().append(k).appendTo("body");j.submit()},disableFormElements:function(b){b.find(c.disableSelector).each(function(){var b=a(this),c=b.is("button")?"html":"val";b.data("ujs:enable-with",b[c]());b[c](b.data("disable-with"));b.prop("disabled",true)})},enableFormElements:function(b){b.find(c.enableSelector).each(function(){var b=a(this),c=b.is("button")?"html":"val";if(b.data("ujs:enable-with"))b[c](b.data("ujs:enable-with"));b.prop("disabled",false)})},allowAction:function(a){var b=a.data("confirm"),d=false,e;if(!b){return true}if(c.fire(a,"confirm")){d=c.confirm(b);e=c.fire(a,"confirm:complete",[d])}return d&&e},blankInputs:function(b,c,d){var e=a(),f,g=c||"input,textarea";b.find(g).each(function(){f=a(this);if(d?f.val():!f.val()){e=e.add(f)}});return e.length?e:false},nonBlankInputs:function(a,b){return c.blankInputs(a,b,true)},stopEverything:function(b){a(b.target).trigger("ujs:everythingStopped");b.stopImmediatePropagation();return false},callFormSubmitBindings:function(c,d){var e=c.data("events"),f=true;if(e!==b&&e["submit"]!==b){a.each(e["submit"],function(a,b){if(typeof b.handler==="function")return f=b.handler(d)})}return f},disableElement:function(a){a.data("ujs:enable-with",a.html());a.html(a.data("disable-with"));a.bind("click.railsDisable",function(a){return c.stopEverything(a)})},enableElement:function(a){if(a.data("ujs:enable-with")!==b){a.html(a.data("ujs:enable-with"));a.data("ujs:enable-with",false)}a.unbind("click.railsDisable")}};a.ajaxPrefilter(function(a,b,d){if(!a.crossDomain){c.CSRFProtection(d)}});a(document).delegate(c.linkDisableSelector,"ajax:complete",function(){c.enableElement(a(this))});a(document).delegate(c.linkClickSelector,"click.rails",function(d){var e=a(this),f=e.data("method"),g=e.data("params");if(!c.allowAction(e))return c.stopEverything(d);if(e.is(c.linkDisableSelector))c.disableElement(e);if(e.data("remote")!==b){if((d.metaKey||d.ctrlKey)&&(!f||f==="GET")&&!g){return true}if(c.handleRemote(e)===false){c.enableElement(e)}return false}else if(e.data("method")){c.handleMethod(e);return false}});a(document).delegate(c.inputChangeSelector,"change.rails",function(b){var d=a(this);if(!c.allowAction(d))return c.stopEverything(b);c.handleRemote(d);return false});a(document).delegate(c.formSubmitSelector,"submit.rails",function(d){var e=a(this),f=e.data("remote")!==b,g=c.blankInputs(e,c.requiredInputSelector),h=c.nonBlankInputs(e,c.fileInputSelector);if(!c.allowAction(e))return c.stopEverything(d);if(g&&e.attr("novalidate")==b&&c.fire(e,"ajax:aborted:required",[g])){return c.stopEverything(d)}if(f){if(h){return c.fire(e,"ajax:aborted:filLine truncated (function(a,b){var c=function(){var b=a(document).data("events");return b&&b.click&&a.grep(b.click,function(a){return a.namespace==="rails"}).length};if(c()){a.error("jquery-ujs has already been loaded!")}var d;a.rails=d={linkClickSelector:"a[data-confirm], a[data-method], a[data-remote], a[data-disable-with]",inputChangeSelector:"select[data-remote], input[data-remote], textarea[data-remote]",formSubmitSelector:"form",formInputClickSelector:"form input[type=submit], form input[type=image], form button[type=submit], form button:not([type])",disableSelector:"input[data-disable-with], button[data-disable-with], textarea[data-disable-with]",enableSelector:"input[data-disable-with]:disabled, button[data-disable-with]:disabled, textarea[data-disable-with]:disabled",requiredInputSelector:"input[name][required]:not([disabled]),textarea[name][required]:not([disabled])",fileInputSelector:"input:file",linkDisableSelector:"a[data-disable-with]",CSRFProtection:function(b){var c=a('meta[name="csrf-token"]').attr("content");if(c)b.setRequestHeader("X-CSRF-Token",c)},fire:function(b,c,d){var e=a.Event(c);b.trigger(e,d);return e.result!==false},confirm:function(a){return confirm(a)},ajax:function(b){return a.ajax(b)},href:function(a){return a.attr("href")},handleRemote:function(c){var e,f,g,h,i,j,k,l;if(d.fire(c,"ajax:before")){h=c.data("cross-domain");i=h===b?null:h;j=c.data("with-credentials")||null;k=c.data("type")||a.ajaxSettings&&a.ajaxSettings.dataType;if(c.is("form")){e=c.attr("method");f=c.attr("action");g=c.serializeArray();var m=c.data("ujs:submit-button");if(m){g.push(m);c.data("ujs:submit-button",null)}}else if(c.is(d.inputChangeSelector)){e=c.data("method");f=c.data("url");g=c.serialize();if(c.data("params"))g=g+"&"+c.data("params")}else{e=c.data("method");f=d.href(c);g=c.data("params")||null}l={type:e||"GET",data:g,dataType:k,beforeSend:function(a,e){if(e.dataType===b){a.setRequestHeader("accept","*/*;q=0.5, "+e.accepts.script)}return d.fire(c,"ajax:beforeSend",[a,e])},success:function(a,b,d){c.trigger("ajax:success",[a,b,d])},complete:function(a,b){c.trigger("ajax:complete",[a,b])},error:function(a,b,d){c.trigger("ajax:error",[a,b,d])},xhrFields:{withCredentials:j},crossDomain:i};if(f){l.url=f}var n=d.ajax(l);c.trigger("ajax:send",n);return n}else{return false}},handleMethod:function(c){var e=d.href(c),f=c.data("method"),g=c.attr("target"),h=a("meta[name=csrf-token]").attr("content"),i=a("meta[name=csrf-param]").attr("content"),j=a('<form method="post" action="'+e+'"></form>'),k='<input name="_method" value="'+f+'" type="hidden" />';if(i!==b&&h!==b){k+='<input name="'+i+'" value="'+h+'" type="hidden" />'}if(g){j.attr("target",g)}j.hide().append(k).appendTo("body");j.submit()},disableFormElements:function(b){b.find(d.disableSelector).each(function(){var b=a(this),c=b.is("button")?"html":"val";b.data("ujs:enable-with",b[c]());b[c](b.data("disable-with"));b.prop("disabled",true)})},enableFormElements:function(b){b.find(d.enableSelector).each(function(){var b=a(this),c=b.is("button")?"html":"val";if(b.data("ujs:enable-with"))b[c](b.data("ujs:enable-with"));b.prop("disabled",false)})},allowAction:function(a){var b=a.data("confirm"),c=false,e;if(!b){return true}if(d.fire(a,"confirm")){c=d.confirm(b);e=d.fire(a,"confirm:complete",[c])}return c&&e},blankInputs:function(b,c,d){var e=a(),f,g,h=c||"input,textarea";b.find(h).each(function(){f=a(this);g=f.is(":checkbox,:radio")?f.is(":checked"):f.val();if(g==!!d){e=e.add(f)}});return e.length?e:false},nonBlankInputs:function(a,b){return d.blankInputs(a,b,true)},stopEverything:function(b){a(b.target).trigger("ujs:everythingStopped");b.stopImmediatePropagation();return false},callFormSubmitBindings:function(c,d){var e=c.data("events"),f=true;if(e!==b&&e["submit"]!==b){a.each(e["submit"],function(a,b){if(typeof b.handler==="function")return f=b.handler(d)})}return f},disableElement:function(a){a.data("ujs:enable-with",a.html());a.html(a.data("disable-with"));a.bind("click.railsDisable",function(a){return d.stopEverything(a)})},enableElement:function(a){if(a.data("ujs:enable-with")!==b){a.html(a.data("ujs:enable-with"));a.data("ujs:enable-with",false)}a.unbind("click.railsDisable")}};if(d.fire(a(document),"rails:attachBindings")){a.ajaxPrefilter(function(a,b,c){if(!a.crossDomain){d.CSRFProtection(c)}});a(document).delegate(d.linkDisableSelector,"ajax:complete",function(){d.enableElement(a(this))});a(document).delegate(d.linkClickSelector,"click.rails",function(c){var e=a(this),f=e.data("method"),g=e.data("params");if(!d.allowAction(e))return d.stopEverything(c);if(e.is(d.linkDisableSelector))d.disableElement(e);if(e.data("remote")!==b){if((c.metaKey||c.ctrlKey)&&(!f||f==="GET")&&!g){return true}if(d.handleRemote(e)===false){d.enableElement(e)}return false}else if(e.data("method")){d.handleMethod(e);return false}});a(document).delegate(d.inputChangeSelector,"change.rails",function(b){var c=a(this);if(!d.allowAction(c))return d.stopEverything(b);d.handleRemote(c);return falseLine truncated
@@ -48,7 +48,7 @@ class ActivitiesControllerTest < ActionController::TestCase
:child => { :tag => "dt", :child => { :tag => "dt",
:attributes => { :class => /issue/ }, :attributes => { :class => /issue/ },
:child => { :tag => "a", :child => { :tag => "a",
:content => /#{Issue.find(1).subject}/, :content => /Can&#x27;t print recipes/,
} }
} }
} }
@@ -69,7 +69,7 @@ class ActivitiesControllerTest < ActionController::TestCase
:child => { :tag => "dt", :child => { :tag => "dt",
:attributes => { :class => /issue/ }, :attributes => { :class => /issue/ },
:child => { :tag => "a", :child => { :tag => "a",
:content => /#{Issue.find(5).subject}/, :content => /Subproject issue/,
} }
} }
} }
@@ -93,7 +93,7 @@ class ActivitiesControllerTest < ActionController::TestCase
:child => { :tag => "dt", :child => { :tag => "dt",
:attributes => { :class => /issue/ }, :attributes => { :class => /issue/ },
:child => { :tag => "a", :child => { :tag => "a",
:content => /#{Issue.find(1).subject}/, :content => /Can&#x27;t print recipes/,
} }
} }
} }
@@ -65,7 +65,7 @@ class AuthSourcesControllerTest < ActionController::TestCase
assert_response :success assert_response :success
assert_template 'new' assert_template 'new'
end end
assert_error_tag :content => /host can't be blank/i assert_error_tag :content => /host can&#x27;t be blank/i
end end
def test_edit def test_edit
@@ -90,7 +90,7 @@ class AuthSourcesControllerTest < ActionController::TestCase
put :update, :id => 1, :auth_source => {:name => 'Renamed', :host => '', :port => '389', :attr_login => 'uid'} put :update, :id => 1, :auth_source => {:name => 'Renamed', :host => '', :port => '389', :attr_login => 'uid'}
assert_response :success assert_response :success
assert_template 'edit' assert_template 'edit'
assert_error_tag :content => /host can't be blank/i assert_error_tag :content => /host can&#x27;t be blank/i
end end
def test_destroy def test_destroy
@@ -53,7 +53,7 @@ class IssueStatusesControllerTest < ActionController::TestCase
post :create, :issue_status => {:name => ''} post :create, :issue_status => {:name => ''}
assert_response :success assert_response :success
assert_template 'new' assert_template 'new'
assert_error_tag :content => /name can't be blank/i assert_error_tag :content => /name can&#x27;t be blank/i
end end
def test_edit def test_edit
@@ -73,7 +73,7 @@ class IssueStatusesControllerTest < ActionController::TestCase
put :update, :id => '3', :issue_status => {:name => ''} put :update, :id => '3', :issue_status => {:name => ''}
assert_response :success assert_response :success
assert_template 'edit' assert_template 'edit'
assert_error_tag :content => /name can't be blank/i assert_error_tag :content => /name can&#x27;t be blank/i
end end
def test_destroy def test_destroy
+12 -12
View File
@@ -61,7 +61,7 @@ class IssuesControllerTest < ActionController::TestCase
assert_template 'index' assert_template 'index'
assert_not_nil assigns(:issues) assert_not_nil assigns(:issues)
assert_nil assigns(:project) assert_nil assigns(:project)
assert_tag :tag => 'a', :content => /Can't print recipes/ assert_tag :tag => 'a', :content => /Can&#x27;t print recipes/
assert_tag :tag => 'a', :content => /Subproject issue/ assert_tag :tag => 'a', :content => /Subproject issue/
# private projects hidden # private projects hidden
assert_no_tag :tag => 'a', :content => /Issue of a private subproject/ assert_no_tag :tag => 'a', :content => /Issue of a private subproject/
@@ -78,7 +78,7 @@ class IssuesControllerTest < ActionController::TestCase
assert_template 'index' assert_template 'index'
assert_not_nil assigns(:issues) assert_not_nil assigns(:issues)
assert_nil assigns(:project) assert_nil assigns(:project)
assert_no_tag :tag => 'a', :content => /Can't print recipes/ assert_no_tag :tag => 'a', :content => /Can&#x27;t print recipes/
assert_tag :tag => 'a', :content => /Subproject issue/ assert_tag :tag => 'a', :content => /Subproject issue/
end end
@@ -95,7 +95,7 @@ class IssuesControllerTest < ActionController::TestCase
assert_response :success assert_response :success
assert_template 'index' assert_template 'index'
assert_not_nil assigns(:issues) assert_not_nil assigns(:issues)
assert_tag :tag => 'a', :content => /Can't print recipes/ assert_tag :tag => 'a', :content => /Can&#x27;t print recipes/
assert_no_tag :tag => 'a', :content => /Subproject issue/ assert_no_tag :tag => 'a', :content => /Subproject issue/
end end
@@ -105,7 +105,7 @@ class IssuesControllerTest < ActionController::TestCase
assert_response :success assert_response :success
assert_template 'index' assert_template 'index'
assert_not_nil assigns(:issues) assert_not_nil assigns(:issues)
assert_tag :tag => 'a', :content => /Can't print recipes/ assert_tag :tag => 'a', :content => /Can&#x27;t print recipes/
assert_tag :tag => 'a', :content => /Subproject issue/ assert_tag :tag => 'a', :content => /Subproject issue/
assert_no_tag :tag => 'a', :content => /Issue of a private subproject/ assert_no_tag :tag => 'a', :content => /Issue of a private subproject/
end end
@@ -117,7 +117,7 @@ class IssuesControllerTest < ActionController::TestCase
assert_response :success assert_response :success
assert_template 'index' assert_template 'index'
assert_not_nil assigns(:issues) assert_not_nil assigns(:issues)
assert_tag :tag => 'a', :content => /Can't print recipes/ assert_tag :tag => 'a', :content => /Can&#x27;t print recipes/
assert_tag :tag => 'a', :content => /Subproject issue/ assert_tag :tag => 'a', :content => /Subproject issue/
assert_tag :tag => 'a', :content => /Issue of a private subproject/ assert_tag :tag => 'a', :content => /Issue of a private subproject/
end end
@@ -823,7 +823,7 @@ class IssuesControllerTest < ActionController::TestCase
:child => { :tag => 'legend', :child => { :tag => 'legend',
:content => /Notes/ } } :content => /Notes/ } }
assert_tag :tag => 'title', assert_tag :tag => 'title',
:content => "Bug #1: Can't print recipes - eCookbook - Redmine" :content => "Bug #1: Can&#x27;t print recipes - eCookbook - Redmine"
end end
def test_show_by_manager def test_show_by_manager
@@ -1807,7 +1807,7 @@ class IssuesControllerTest < ActionController::TestCase
assert_template 'new' assert_template 'new'
issue = assigns(:issue) issue = assigns(:issue)
assert_not_nil issue assert_not_nil issue
assert_error_tag :content => /Database can't be blank/ assert_error_tag :content => /Database can&#x27;t be blank/
end end
def test_create_should_validate_required_fields def test_create_should_validate_required_fields
@@ -1831,8 +1831,8 @@ class IssuesControllerTest < ActionController::TestCase
assert_template 'new' assert_template 'new'
end end
assert_error_tag :content => /Due date can't be blank/i assert_error_tag :content => /Due date can&#x27;t be blank/i
assert_error_tag :content => /Bar can't be blank/i assert_error_tag :content => /Bar can&#x27;t be blank/i
end end
def test_create_should_ignore_readonly_fields def test_create_should_ignore_readonly_fields
@@ -2869,7 +2869,7 @@ class IssuesControllerTest < ActionController::TestCase
assert_response :success assert_response :success
assert_template 'edit' assert_template 'edit'
assert_error_tag :descendant => {:content => /Activity can't be blank/} assert_error_tag :descendant => {:content => /Activity can&#x27;t be blank/}
assert_tag :textarea, :attributes => { :name => 'notes' }, :content => "\n"+notes assert_tag :textarea, :attributes => { :name => 'notes' }, :content => "\n"+notes
assert_tag :input, :attributes => { :name => 'time_entry[hours]', :value => "2z" } assert_tag :input, :attributes => { :name => 'time_entry[hours]', :value => "2z" }
end end
@@ -2887,8 +2887,8 @@ class IssuesControllerTest < ActionController::TestCase
assert_response :success assert_response :success
assert_template 'edit' assert_template 'edit'
assert_error_tag :descendant => {:content => /Activity can't be blank/} assert_error_tag :descendant => {:content => /Activity can&#x27;t be blank/}
assert_error_tag :descendant => {:content => /Hours can't be blank/} assert_error_tag :descendant => {:content => /Hours can&#x27;t be blank/}
assert_tag :textarea, :attributes => { :name => 'notes' }, :content => "\n"+notes assert_tag :textarea, :attributes => { :name => 'notes' }, :content => "\n"+notes
assert_tag :input, :attributes => { :name => 'time_entry[comments]', :value => "this is my comment" } assert_tag :input, :attributes => { :name => 'time_entry[comments]', :value => "this is my comment" }
end end
+1 -1
View File
@@ -149,7 +149,7 @@ class MyControllerTest < ActionController::TestCase
:new_password_confirmation => 'hello2' :new_password_confirmation => 'hello2'
assert_response :success assert_response :success
assert_template 'password' assert_template 'password'
assert_error_tag :content => /Password doesn't match confirmation/ assert_error_tag :content => /Password doesn&#x27;t match confirmation/
# wrong password # wrong password
post :password, :password => 'wrongpassword', post :password, :password => 'wrongpassword',
+2 -2
View File
@@ -123,7 +123,7 @@ class NewsControllerTest < ActionController::TestCase
assert_template 'new' assert_template 'new'
assert_not_nil assigns(:news) assert_not_nil assigns(:news)
assert assigns(:news).new_record? assert assigns(:news).new_record?
assert_error_tag :content => /title can't be blank/i assert_error_tag :content => /title can&#x27;t be blank/i
end end
def test_get_edit def test_get_edit
@@ -160,7 +160,7 @@ class NewsControllerTest < ActionController::TestCase
put :update, :id => 1, :news => { :description => '' } put :update, :id => 1, :news => { :description => '' }
assert_response :success assert_response :success
assert_template 'edit' assert_template 'edit'
assert_error_tag :content => /description can't be blank/i assert_error_tag :content => /description can&#x27;t be blank/i
end end
def test_destroy def test_destroy
+1 -1
View File
@@ -409,7 +409,7 @@ class ProjectsControllerTest < ActionController::TestCase
post :update, :id => 1, :project => {:name => ''} post :update, :id => 1, :project => {:name => ''}
assert_response :success assert_response :success
assert_template 'settings' assert_template 'settings'
assert_error_tag :content => /name can't be blank/i assert_error_tag :content => /name can&#x27;t be blank/i
end end
def test_update_should_be_denied_for_member_on_closed_project def test_update_should_be_denied_for_member_on_closed_project
+2 -2
View File
@@ -95,7 +95,7 @@ class TrackersControllerTest < ActionController::TestCase
end end
assert_response :success assert_response :success
assert_template 'new' assert_template 'new'
assert_error_tag :content => /name can't be blank/i assert_error_tag :content => /name can&#x27;t be blank/i
end end
def test_edit def test_edit
@@ -160,7 +160,7 @@ class TrackersControllerTest < ActionController::TestCase
put :update, :id => 1, :tracker => { :name => '' } put :update, :id => 1, :tracker => { :name => '' }
assert_response :success assert_response :success
assert_template 'edit' assert_template 'edit'
assert_error_tag :content => /name can't be blank/i assert_error_tag :content => /name can&#x27;t be blank/i
end end
def test_move_lower def test_move_lower
+1 -1
View File
@@ -58,7 +58,7 @@ class WikisControllerTest < ActionController::TestCase
end end
assert_include 'errorExplanation', response.body assert_include 'errorExplanation', response.body
assert_include 'Start page can\\\'t be blank', response.body assert_include 'Start page can&#x27;t be blank', response.body
end end
def test_update def test_update
+1 -1
View File
@@ -690,7 +690,7 @@ RAW
expected = <<-EXPECTED expected = <<-EXPECTED
<p><a href="/projects/ecookbook/wiki/CookBook_documentation" class="wiki-page">CookBook documentation</a></p> <p><a href="/projects/ecookbook/wiki/CookBook_documentation" class="wiki-page">CookBook documentation</a></p>
<p><a href="/issues/1" class="issue status-1 priority-4" title="Can't print recipes (New)">#1</a></p> <p><a href="/issues/1" class="issue status-1 priority-4" title="Can&#x27;t print recipes (New)">#1</a></p>
<pre> <pre>
[[CookBook documentation]] [[CookBook documentation]]
+3 -3
View File
@@ -55,7 +55,7 @@ class MailerTest < ActiveSupport::TestCase
# link to a referenced ticket # link to a referenced ticket
assert_select 'a[href=?][title=?]', assert_select 'a[href=?][title=?]',
'https://mydomain.foo/issues/1', 'https://mydomain.foo/issues/1',
'Can\'t print recipes (New)', 'Can&#x27;t print recipes (New)',
:text => '#1' :text => '#1'
# link to a changeset # link to a changeset
assert_select 'a[href=?][title=?]', assert_select 'a[href=?][title=?]',
@@ -94,7 +94,7 @@ class MailerTest < ActiveSupport::TestCase
# link to a referenced ticket # link to a referenced ticket
assert_select 'a[href=?][title=?]', assert_select 'a[href=?][title=?]',
'http://mydomain.foo/rdm/issues/1', 'http://mydomain.foo/rdm/issues/1',
'Can\'t print recipes (New)', 'Can&#x27;t print recipes (New)',
:text => '#1' :text => '#1'
# link to a changeset # link to a changeset
assert_select 'a[href=?][title=?]', assert_select 'a[href=?][title=?]',
@@ -134,7 +134,7 @@ class MailerTest < ActiveSupport::TestCase
# link to a referenced ticket # link to a referenced ticket
assert_select 'a[href=?][title=?]', assert_select 'a[href=?][title=?]',
'http://mydomain.foo/rdm/issues/1', 'http://mydomain.foo/rdm/issues/1',
'Can\'t print recipes (New)', 'Can&#x27;t print recipes (New)',
:text => '#1' :text => '#1'
# link to a changeset # link to a changeset
assert_select 'a[href=?][title=?]', assert_select 'a[href=?][title=?]',