@@ -64,7 +64,6 @@ class Admin::ResourceController < ApplicationController def destroy model.destroy - announce_removed response_for :destroy end @@ -142,6 +141,7 @@ class Admin::ResourceController < ApplicationController end def announce_removed + ActiveSupport::Deprecation.warn("announce_removed is no longer encouraged in Radiant 0.9.x.", caller) flash[:notice] = "#{humanized_model_name} has been deleted." end app/controllers/admin/resource_controller.rb @@ -58,7 +58,7 @@ Feature: Managing pages And I follow "remove page" Then I should see "permanently remove" When I press "Delete Pages" - Then I should see "successfully removed" + Then I should see "No Pages" Scenario: View a page When I view a page features/admin/pages_management.feature @@ -22,7 +22,7 @@ Feature: Managing snippets And I press "Create Snippet" Then I should be on the snippets list And I should see "Mine" - + Scenario: Display form errors When I follow "Design" within "navigation" And I follow "Snippets" @@ -41,17 +41,16 @@ Feature: Managing snippets And I press "Save and Continue Editing" Then I should see "Edit Snippet" And I should see the form - + Scenario: View a snippet When I view a snippet Then I should see "Edit Snippet" - + Scenario: Delete a snippet with confirmation When I follow "Design" within "navigation" And I follow "Snippets" - And I follow "Remove" + And I follow "Remove Snippet" Then I should see "permanently remove" And I should see "another" When I press "Delete Snippet" - Then I should see "has been deleted" - And I should see "first" \ No newline at end of file + Then I should not see "another" \ No newline at end of file features/admin/snippets_management.feature @@ -59,5 +59,4 @@ Feature: Managing users Then I should see "permanently remove" And I should see "Another" When I press "Delete User" - Then I should see "been deleted" And I should not see "Another" \ No newline at end of file features/admin/users_management.feature @@ -54,7 +54,7 @@ module Radiant end def deprecated_add(name, url, caller) - ActiveSupport::Deprecation.warn("admin.tabs.add is no longer supported in Radiant 0.9+. Please update your code to use admin.nav", caller) + ActiveSupport::Deprecation.warn("admin.tabs.add is no longer supported in Radiant 0.9.x. Please update your code to use admin.nav", caller) NavSubItem.new(name.underscore.to_sym, name, url) end end lib/radiant/admin_ui.rb 2691d7c8f086e5be2e0ecd129ced2a188c2fa966 John W. Long me@johnwlong.com http://github.com/radiant/radiant/commit/ea462b4ccf24d1878fcc0735da05cf3e7f79f043 ea462b4ccf24d1878fcc0735da05cf3e7f79f043 2009-09-30T22:54:32-07:00 2009-09-30T22:46:39-07:00 removed "X has been deleted" flash messages and deprecated #announce_removed in Admin::ResourceController 717ad1b12f260b5c5983afacd6507194fef87092 John W. Long me@johnwlong.com