Make sure the RSS token is getting destroyed and created.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3210 e93f8b46-1217-0410-a6f0-8f06a7374b81

Make sure the RSS token is getting destroyed and created.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3210 e93f8b46-1217-0410-a6f0-8f06a7374b81
e1013c44 · Eric Davis · c478fa7f · e1013c44 · e1013c44
Commit e1013c44 authored Dec 21, 2009 by Eric Davis
Hide whitespace changes
Inline Side-by-side

Showing with 40 additions and 2 deletions

my_controller.rb app/controllers/my_controller.rb +6 -2

my_controller_test.rb test/functional/my_controller_test.rb +34 -0

No files found.
--- a/app/controllers/my_controller.rb
+++ b/app/controllers/my_controller.rb
@@ -97,8 +97,12 @@ class MyController < ApplicationController
  
  # Create a new feeds key
  def reset_rss_key
-    if request.post? && User.current.rss_token
-      User.current.rss_token.destroy
+    if request.post?
+      if User.current.rss_token
+        User.current.rss_token.destroy
+        User.current.reload
+      end
+      User.current.rss_key
      flash[:notice] = l(:notice_feeds_access_key_reseted)
    end
    redirect_to :action => 'account'

--- a/test/functional/my_controller_test.rb
+++ b/test/functional/my_controller_test.rb
@@ -129,4 +129,38 @@ class MyControllerTest < ActionController::TestCase
    assert_response :success
    assert_equal ['documents', 'calendar', 'latestnews'], User.find(2).pref[:my_page_layout]['left']
  end
+
+  context "POST to reset_rss_key" do
+    context "with an existing rss_token" do
+      setup do
+        @previous_token_value = User.find(2).rss_key # Will generate one if it's missing
+        post :reset_rss_key
+      end
+
+      should "destroy the existing token" do
+        assert_not_equal @previous_token_value, User.find(2).rss_key
+      end
+
+      should "create a new token" do
+        assert User.find(2).rss_token
+      end
+
+      should_set_the_flash_to /reset/
+      should_redirect_to('my account') {'/my/account' }
+    end
+    
+    context "with no rss_token" do
+      setup do
+        assert_nil User.find(2).rss_token
+        post :reset_rss_key
+      end
+
+      should "create a new token" do
+        assert User.find(2).rss_token
+      end
+
+      should_set_the_flash_to /reset/
+      should_redirect_to('my account') {'/my/account' }
+    end
+  end
 end