diff options
Diffstat (limited to 'actionpack/lib/action_controller/assertions/deprecated_assertions.rb')
| -rw-r--r-- | actionpack/lib/action_controller/assertions/deprecated_assertions.rb | 228 |
1 files changed, 0 insertions, 228 deletions
diff --git a/actionpack/lib/action_controller/assertions/deprecated_assertions.rb b/actionpack/lib/action_controller/assertions/deprecated_assertions.rb deleted file mode 100644 index 5fd187933f..0000000000 --- a/actionpack/lib/action_controller/assertions/deprecated_assertions.rb +++ /dev/null @@ -1,228 +0,0 @@ -require 'rexml/document' - -module ActionController #:nodoc: - module Assertions #:nodoc: - module DeprecatedAssertions #:nodoc: - def assert_success(message=nil) #:nodoc: - assert_response(:success, message) - end - deprecate :assert_success => "use assert_response(:success)" - - def assert_redirect(message=nil) #:nodoc: - assert_response(:redirect, message) - end - deprecate :assert_redirect => "use assert_response(:redirect)" - - def assert_rendered_file(expected=nil, message=nil) #:nodoc: - assert_template(expected, message) - end - deprecate :assert_rendered_file => :assert_template - - # ensure that the session has an object with the specified name - def assert_session_has(key=nil, message=nil) #:nodoc: - msg = build_message(message, "<?> is not in the session <?>", key, @response.session) - assert_block(msg) { @response.has_session_object?(key) } - end - deprecate :assert_session_has => "use assert(@response.has_session_object?(key))" - - # ensure that the session has no object with the specified name - def assert_session_has_no(key=nil, message=nil) #:nodoc: - msg = build_message(message, "<?> is in the session <?>", key, @response.session) - assert_block(msg) { !@response.has_session_object?(key) } - end - deprecate :assert_session_has_no => "use assert(!@response.has_session_object?(key))" - - def assert_session_equal(expected = nil, key = nil, message = nil) #:nodoc: - msg = build_message(message, "<?> expected in session['?'] but was <?>", expected, key, @response.session[key]) - assert_block(msg) { expected == @response.session[key] } - end - deprecate :assert_session_equal => "use assert_equal(expected, @response[key])" - - # -- cookie assertions --------------------------------------------------- - - def assert_no_cookie(key = nil, message = nil) #:nodoc: - actual = @response.cookies[key] - msg = build_message(message, "<?> not expected in cookies['?']", actual, key) - assert_block(msg) { actual.nil? or actual.empty? } - end - deprecate :assert_no_cookie => "use assert(!@response.cookies.key?(key))" - - def assert_cookie_equal(expected = nil, key = nil, message = nil) #:nodoc: - actual = @response.cookies[key] - actual = actual.first if actual - msg = build_message(message, "<?> expected in cookies['?'] but was <?>", expected, key, actual) - assert_block(msg) { expected == actual } - end - deprecate :assert_cookie_equal => "use assert(@response.cookies.key?(key))" - - # -- flash assertions --------------------------------------------------- - - # ensure that the flash has an object with the specified name - def assert_flash_has(key=nil, message=nil) #:nodoc: - msg = build_message(message, "<?> is not in the flash <?>", key, @response.flash) - assert_block(msg) { @response.has_flash_object?(key) } - end - deprecate :assert_flash_has => "use assert(@response.has_flash_object?(key))" - - # ensure that the flash has no object with the specified name - def assert_flash_has_no(key=nil, message=nil) #:nodoc: - msg = build_message(message, "<?> is in the flash <?>", key, @response.flash) - assert_block(msg) { !@response.has_flash_object?(key) } - end - deprecate :assert_flash_has_no => "use assert(!@response.has_flash_object?(key))" - - # ensure the flash exists - def assert_flash_exists(message=nil) #:nodoc: - msg = build_message(message, "the flash does not exist <?>", @response.session['flash'] ) - assert_block(msg) { @response.has_flash? } - end - deprecate :assert_flash_exists => "use assert(@response.has_flash?)" - - # ensure the flash does not exist - def assert_flash_not_exists(message=nil) #:nodoc: - msg = build_message(message, "the flash exists <?>", @response.flash) - assert_block(msg) { !@response.has_flash? } - end - deprecate :assert_flash_not_exists => "use assert(!@response.has_flash?)" - - # ensure the flash is empty but existent - def assert_flash_empty(message=nil) #:nodoc: - msg = build_message(message, "the flash is not empty <?>", @response.flash) - assert_block(msg) { !@response.has_flash_with_contents? } - end - deprecate :assert_flash_empty => "use assert(!@response.has_flash_with_contents?)" - - # ensure the flash is not empty - def assert_flash_not_empty(message=nil) #:nodoc: - msg = build_message(message, "the flash is empty") - assert_block(msg) { @response.has_flash_with_contents? } - end - deprecate :assert_flash_not_empty => "use assert(@response.has_flash_with_contents?)" - - def assert_flash_equal(expected = nil, key = nil, message = nil) #:nodoc: - msg = build_message(message, "<?> expected in flash['?'] but was <?>", expected, key, @response.flash[key]) - assert_block(msg) { expected == @response.flash[key] } - end - deprecate :assert_flash_equal => "use assert_equal(expected, @response.flash[key])" - - - # ensure our redirection url is an exact match - def assert_redirect_url(url=nil, message=nil) #:nodoc: - assert_redirect(message) - msg = build_message(message, "<?> is not the redirected location <?>", url, @response.redirect_url) - assert_block(msg) { @response.redirect_url == url } - end - deprecate :assert_redirect_url => "use assert_equal(url, @response.redirect_url)" - - # ensure our redirection url matches a pattern - def assert_redirect_url_match(pattern=nil, message=nil) #:nodoc: - assert_redirect(message) - msg = build_message(message, "<?> was not found in the location: <?>", pattern, @response.redirect_url) - assert_block(msg) { @response.redirect_url_match?(pattern) } - end - deprecate :assert_redirect_url_match => "use assert(@response.redirect_url_match?(pattern))" - - - # -- template assertions ------------------------------------------------ - - # ensure that a template object with the given name exists - def assert_template_has(key=nil, message=nil) #:nodoc: - msg = build_message(message, "<?> is not a template object", key ) - assert_block(msg) { @response.has_template_object?(key) } - end - deprecate :assert_template_has => "use assert(@response.has_template_object?(key))" - - # ensure that a template object with the given name does not exist - def assert_template_has_no(key=nil,message=nil) #:nodoc: - msg = build_message(message, "<?> is a template object <?>", key, @response.template_objects[key]) - assert_block(msg) { !@response.has_template_object?(key) } - end - deprecate :assert_template_has_no => "use assert(!@response.has_template_object?(key))" - - # ensures that the object assigned to the template on +key+ is equal to +expected+ object. - def assert_template_equal(expected = nil, key = nil, message = nil) #:nodoc: - msg = build_message(message, "<?> expected in assigns['?'] but was <?>", expected, key, @response.template.assigns[key.to_s]) - assert_block(msg) { expected == @response.template.assigns[key.to_s] } - end - alias_method :assert_assigned_equal, :assert_template_equal - deprecate :assert_assigned_equal => "use assert_equal(expected, @response.template.assigns[key.to_s])" - deprecate :assert_template_equal => "use assert_equal(expected, @response.template.assigns[key.to_s])" - - # Asserts that the template returns the +expected+ string or array based on the XPath +expression+. - # This will only work if the template rendered a valid XML document. - def assert_template_xpath_match(expression=nil, expected=nil, message=nil) #:nodoc: - xml, matches = REXML::Document.new(@response.body), [] - xml.elements.each(expression) { |e| matches << e.text } - if matches.empty? then - msg = build_message(message, "<?> not found in document", expression) - flunk(msg) - return - elsif matches.length < 2 then - matches = matches.first - end - - msg = build_message(message, "<?> found <?>, not <?>", expression, matches, expected) - assert_block(msg) { matches == expected } - end - deprecate :assert_template_xpath_match => "you should use assert_tag, instead" - - # Assert the template object with the given name is an Active Record descendant and is valid. - def assert_valid_record(key = nil, message = nil) #:nodoc: - record = find_record_in_template(key) - msg = build_message(message, "Active Record is invalid <?>)", record.errors.full_messages) - assert_block(msg) { record.valid? } - end - deprecate :assert_valid_record => "use assert(assigns(key).valid?)" - - # Assert the template object with the given name is an Active Record descendant and is invalid. - def assert_invalid_record(key = nil, message = nil) #:nodoc: - record = find_record_in_template(key) - msg = build_message(message, "Active Record is valid)") - assert_block(msg) { !record.valid? } - end - deprecate :assert_invalid_record => "use assert(!assigns(key).valid?)" - - # Assert the template object with the given name is an Active Record descendant and the specified column(s) are valid. - def assert_valid_column_on_record(key = nil, columns = "", message = nil) #:nodoc: - record = find_record_in_template(key) - record.send(:validate) - - cols = glue_columns(columns) - cols.delete_if { |col| !record.errors.invalid?(col) } - msg = build_message(message, "Active Record has invalid columns <?>)", cols.join(",") ) - assert_block(msg) { cols.empty? } - end - deprecate :assert_valid_column_on_record => "use assert(!record.errors.invalid?(column)) instead" - - # Assert the template object with the given name is an Active Record descendant and the specified column(s) are invalid. - def assert_invalid_column_on_record(key = nil, columns = "", message = nil) #:nodoc: - record = find_record_in_template(key) - record.send(:validate) - - cols = glue_columns(columns) - cols.delete_if { |col| record.errors.invalid?(col) } - msg = build_message(message, "Active Record has valid columns <?>)", cols.join(",") ) - assert_block(msg) { cols.empty? } - end - deprecate :assert_invalid_column_on_record => "use assert(record.errors.invalid?(column)) instead" - - private - def glue_columns(columns) - cols = [] - cols << columns if columns.class == String - cols += columns if columns.class == Array - cols - end - - def find_record_in_template(key = nil) - assert_not_nil assigns(key) - record = @response.template_objects[key] - - assert_not_nil(record) - assert_kind_of ActiveRecord::Base, record - - return record - end - end - end -end |