typo 5.1.3 → 5.1.98

data/spec/controllers/admin/feedback_controller_spec.rb

@@ -1,45 +1,297 @@
 require File.dirname(__FILE__) + '/../../../test/test_helper'
 require File.dirname(__FILE__) + '/../../spec_helper'
-require 'comment'
-require 'trackback'
 
 describe Admin::FeedbackController do
-  before do
-    request.session = { :user => users(:tobi).id }
-  end
 
-  def test_index
-    get :index
+  integrate_views
+
+  describe "destroy feedback with feedback from own article", :shared => true  do
+    it 'should destroy feedback' do
+      lambda do
+        post 'delete', :id => feedback_from_own_article.id
+      end.should change(Feedback, :count)
+      lambda do
+        Feedback.find(feedback_from_own_article.id)
+      end.should raise_error(ActiveRecord::RecordNotFound)
+    end
 
-    assert_response :success
-    assert_template 'index'
-    assert_equal Feedback.count, assigns(:feedback).size
+    it 'should redirect to feedback from article' do
+      post 'delete', :id => feedback_from_own_article.id
+      response.should redirect_to(:controller => 'admin/feedback', :action => 'article', :id => feedback_from_own_article.article.id)
+    end
+
+    it 'should not delete feedback in get request' do
+      lambda do
+        get 'delete', :id => feedback_from_own_article.id
+      end.should_not change(Feedback, :count)
+      lambda do
+        Feedback.find(feedback_from_own_article.id)
+      end.should_not raise_error(ActiveRecord::RecordNotFound)
+      response.should redirect_to(:controller => 'admin/feedback', :action => 'article', :id => feedback_from_own_article.article.id)
+    end
   end
 
-  def test_list_unconfirmed
-    get :index, :confirmed => 'f'
 
-    assert_response :success
-    assert_template 'index'
+  describe 'logged in admin user' do
 
-    Feedback.count(:conditions => { :status_confirmed => false }).should == assigns(:feedback).size
-  end
+    def feedback_from_own_article
+      feedback(:spam_comment)
+    end
+
+    def feedback_from_not_own_article
+      feedback(:spam_comment)
+    end
+
+    before do
+      request.session = { :user => users(:tobi).id }
+    end
+
+    describe 'delete action' do
+
+      it_should_behave_like "destroy feedback with feedback from own article"
+
+      it "should delete feedback from article doesn't own" do
+        lambda do
+          post 'delete', :id => feedback_from_not_own_article.id
+        end.should change(Feedback, :count)
+        lambda do
+          Feedback.find(feedback_from_not_own_article.id)
+        end.should raise_error(ActiveRecord::RecordNotFound)
+        response.should redirect_to(:controller => 'admin/feedback', :action => 'article', :id => feedback_from_not_own_article.article.id)
+      end
+    end
+
+    describe 'index action' do
+
+      def should_success_with_index(response)
+        response.should be_success
+        response.should render_template('index')
+      end
+
+      it 'should success' do
+        get :index
+        should_success_with_index(response)
+        #FIXME : Test is useless because the pagination is on 10. Now there are 11
+        #feedback, so there are several feedback :(
+        assert_equal 10, assigns(:feedback).size #Feedback.count, assigns(:feedback).size
+      end
+
+      it 'should view only confirmed feedback' do
+        get :index, :confirmed => 'f'
+        should_success_with_index(response)
+        Feedback.count(:conditions => { :status_confirmed => false }).should == assigns(:feedback).size
+      end
+
+      it 'should view only spam feedback' do
+        get :index, :published => 'f'
+        should_success_with_index(response)
+        Feedback.count(:conditions => { :published => false }).should == assigns(:feedback).size
+      end
+
+      it 'should view unconfirmed_spam' do
+        get :index, :published => 'f', :confirmed => 'f'
+        should_success_with_index(response)
+        Feedback.count(:conditions => { :published => false, :status_confirmed => false }).should == assigns(:feedback).size
+      end
+
+      it 'should get page 1 if page params empty' do
+        get :index, :page => ''
+        should_success_with_index(response)
+      end
+
+    end
+
+    describe 'article action' do
+
+      def should_success_with_article_view(response)
+        response.should be_success
+        response.should render_template('article')
+      end
+
+      it 'should see all feedback on one article' do
+        get :article, :id => contents(:article1).id
+        should_success_with_article_view(response)
+        assigns(:article).should == contents(:article1)
+        assigns(:comments).size.should == 2
+      end
+
+      it 'should see only spam feedback on one article' do
+        get :article, :id => contents(:article1).id, :spam => 'y'
+        should_success_with_article_view(response)
+        assigns(:article).should == contents(:article1)
+        assigns(:comments).size.should == 1
+      end
+
+      it 'should see only ham feedback on one article' do
+        get :article, :id => contents(:article1).id, :ham => 'y'
+        should_success_with_article_view(response)
+        assigns(:article).should == contents(:article1)
+        assigns(:comments).size.should == 1
+      end
+
+      it 'should redirect_to index if bad article id' do
+        lambda{
+          get :article, :id => 102302
+        }.should raise_error(ActiveRecord::RecordNotFound)
+      end
+
+    end
+
+    describe 'create action' do
+
+      def base_comment(options = {})
+        {"body"=>"a new comment", "author"=>"Me", "url"=>"http://typosphere.org", "email"=>"dev@typosphere.org"}.merge(options)
+      end
 
-  def test_list_spam
-    get :index, :published => 'f'
+      describe 'by get access' do
+        it "should raise ActiveRecordNotFound if article doesn't exist" do
+          lambda {
+            get 'create', :article_id => 120431, :comment => base_comment
+          }.should raise_error(ActiveRecord::RecordNotFound)
+        end
 
-    assert_response :success
-    assert_template 'index'
+        it 'should not create comment' do
+          assert_no_difference 'Comment.count' do
+            get 'create', :article_id => contents(:article1).id, :comment => base_comment
+            response.should redirect_to(:action => 'article', :id => contents(:article1).id)
+          end
+        end
 
-    Feedback.count(:conditions => { :published => false }).should == assigns(:feedback).size
+      end
+
+      describe 'by post access' do
+        it "should raise ActiveRecordNotFound if article doesn't exist" do
+          lambda {
+            post 'create', :article_id => 123104, :comment => base_comment
+          }.should raise_error(ActiveRecord::RecordNotFound)
+        end
+
+        it 'should create comment' do
+          assert_difference 'Comment.count' do
+            post 'create', :article_id => contents(:article1).id, :comment => base_comment
+            response.should redirect_to(:action => 'article', :id => contents(:article1).id)
+          end
+        end
+
+        it 'should create comment mark as ham' do
+          assert_difference 'Comment.count(:conditions => {:state => "ham"})' do
+            post 'create', :article_id => contents(:article1).id, :comment => base_comment
+            response.should redirect_to(:action => 'article', :id => contents(:article1).id)
+          end
+        end
+
+      end
+
+    end
+
+    describe 'edit action' do
+
+      it 'should render edit form' do
+        get 'edit', :id => feedback(:comment2).id
+        assigns(:comment).should == feedback(:comment2)
+        assigns(:article).should == contents(:article1)
+        response.should be_success
+        response.should render_template('edit')
+      end
+
+    end
+
+    describe 'update action' do
+
+      it 'should update comment if post request' do
+        post 'update', :id => feedback(:comment2).id, 
+          :comment => {:author => 'Bob Foo2', 
+                       :url => 'http://fakeurl.com',
+                       :body => 'updated comment'}
+        response.should redirect_to(:action => 'article', :id => contents(:article1).id)
+        feedback(:comment2).reload
+        feedback(:comment2).body.should == 'updated comment'
+      end
+
+      it 'should not  update comment if get request' do
+        get 'update', :id => feedback(:comment2).id, 
+          :comment => {:author => 'Bob Foo2', 
+                       :url => 'http://fakeurl.com',
+                       :body => 'updated comment'}
+        response.should redirect_to(:action => 'edit', :id => feedback(:comment2).id)
+        feedback(:comment2).reload
+        feedback(:comment2).body.should_not == 'updated comment'
+      end
+
+
+    end
   end
 
-  def test_list_unconfirmed_spam
-    get :index, :published => 'f', :confirmed => 'f'
+  describe 'publisher access' do
 
-    assert_response :success
-    assert_template 'index'
+    before :each do
+      request.session = { :user => users(:user_publisher).id }
+    end
 
-    Feedback.count(:conditions => { :published => false, :status_confirmed => false }).should == assigns(:feedback).size
+
+    def feedback_from_own_article
+      feedback(:comment_on_publisher_article)
+    end
+    
+    def feedback_from_not_own_article
+      feedback(:comment2)
+    end
+
+    describe 'delete action' do
+
+      it_should_behave_like "destroy feedback with feedback from own article"
+
+      it "should not delete feedback doesn't own" do
+        lambda do
+          post 'delete', :id => feedback_from_not_own_article.id
+        end.should_not change(Feedback, :count)
+        lambda do
+          Feedback.find(feedbackfrom_not_own_article.id)
+        end.should_not raise_error(ActiveRecord::RecordNotFound)
+        response.should redirect_to(:controller => 'admin/feedback', :action => 'index')
+      end
+    end
+
+    describe 'edit action' do
+
+      it 'should not edit comment no own article' do
+        get 'edit', :id => feedback_from_not_own_article.id
+        response.should redirect_to(:action => 'index')
+      end
+
+      it 'should edit comment if own article' do
+        get 'edit', :id => feedback_from_own_article.id
+        response.should be_success
+        response.should render_template('edit')
+        assigns(:comment).should == feedback_from_own_article
+        assigns(:article).should == feedback_from_own_article.article
+      end
+
+    end
+
+    describe 'update action' do
+
+      it 'should update comment if own article' do
+        post 'update', :id => feedback_from_own_article.id, 
+          :comment => {:author => 'Bob Foo2', 
+                       :url => 'http://fakeurl.com',
+                       :body => 'updated comment'}
+        response.should redirect_to(:action => 'article', :id => feedback_from_own_article.article.id)
+        feedback_from_own_article.reload
+        feedback_from_own_article.body.should == 'updated comment'
+      end
+
+      it 'should not update comment if not own article' do
+        post 'update', :id => feedback_from_not_own_article.id, 
+          :comment => {:author => 'Bob Foo2', 
+                       :url => 'http://fakeurl.com',
+                       :body => 'updated comment'}
+        response.should redirect_to(:action => 'index')
+        feedback_from_not_own_article.reload
+        feedback_from_not_own_article.body.should_not == 'updated comment'
+      end
+
+    end
   end
+
 end

data/spec/controllers/admin/pages_controller_spec.rb

@@ -14,12 +14,6 @@ describe Admin::PagesController do
     get :index
     assert_response :success
     assert_template "index"
-  end
-
-  def test_list
-    get :list
-    assert_response :success
-    assert_template "index"
 
     assert_not_nil assigns(:pages)
     #assert_equal Page.count, assigns(:pages).size

data/spec/controllers/admin/resources_controller_spec.rb

@@ -10,13 +10,12 @@ describe Admin::ResourcesController do
     @request.session = { :user => users(:tobi).id }
   end
 
-  def test_list
-    get :list
+  def test_index
+    get :index
     assert_response :success
     assert_template 'index'
     assert_template_has 'resources'
     assert_not_nil assigns(:resources)
-    assert_not_nil assigns(:resources_pages)
   end
 
   def test_destroy
@@ -29,9 +28,7 @@ describe Admin::ResourcesController do
     assert_not_nil assigns(:file)
 
     post :destroy, :id => res_id
-    assert_response 302
-    follow_redirect
-    assert_template 'index'
+    response.should redirect_to(:action => 'index')
   end
 
   def test_new

data/spec/controllers/admin/settings_controller_spec.rb

@@ -14,7 +14,27 @@ describe Admin::SettingsController do
     get :index
     assert_template 'index'
   end
-
+  
+  def test_read
+    get :read
+    assert_template 'read'
+  end
+  
+  def test_write
+    get :write
+    assert_template 'write'
+  end
+  
+  def test_feedback
+    get :feedback
+    assert_template 'feedback'
+  end
+  
+  def test_seo
+    get :seo
+    assert_template 'seo'
+  end
+  
   def test_redirect
     get :redirect
     assert_response :redirect, :controller => 'admin/settings', :action => 'index'

data/spec/controllers/admin/tags_controller_spec.rb

@@ -0,0 +1,35 @@
+require File.dirname(__FILE__) + '/../../../test/test_helper'
+require File.dirname(__FILE__) + '/../../spec_helper'
+require 'admin/tags_controller'
+
+# Re-raise errors caught by the controller.
+class Admin::TagsController; def rescue_action(e) raise e end; end
+
+describe Admin::TagsController do
+  before do
+    request.session = { :user => users(:tobi).id }
+  end
+
+  def test_index
+    get :index
+    assert_template 'index'
+    assert_template_has 'tags'
+  end
+  
+  def test_edit
+    get :edit, 'id' => contents(:article1).tags.first.id
+    assert_template 'edit'
+    assert_template_has 'tag'
+    assert_valid assigns(:tag)
+  end
+  
+  def test_update
+    tag = Tag.find_by_id(contents(:article1).tags.first.id)
+    post :edit, 'id' => tag.id, 'tag' => {:name => 'foobar', :display_name => 'Foo Bar'}
+    assert_response :redirect, :action => 'index'
+    tag = Tag.find_by_id(contents(:article1).tags.first.id)
+    assert_equal "foobar", tag.name
+    assert_equal "Foo Bar", tag.display_name
+  end
+  
+end

data/spec/controllers/admin/textfilters_controller_spec.rb

@@ -6,19 +6,20 @@ require 'admin/textfilters_controller'
 class Admin::TextfiltersController; def rescue_action(e) raise e end; end
 
 describe Admin::TextfiltersController do
+
+  integrate_views
+
   before do
     request.session = { :user => users(:tobi).id }
   end
 
-  def test_new_without_filters
-    post :new, :textfilter => { :name => 'filterx',
-      :description => 'Filter X', :markup => 'markdown' }
-    assert_response :redirect, :action => 'show'
-  end
+  describe 'macro help action' do
+
+    it 'should render success' do
+      get 'macro_help', :id => 'code'
+      response.should be_success
+    end
 
-  def test_edit_without_filters
-    post :edit, :id => text_filters(:markdown_filter).id, :textfilter => { :name => 'filterx',
-      :description => 'Filter X', :markup => 'markdown' }
-    assert_response :redirect, :action => 'show'
   end
+
 end

data/spec/controllers/admin/users_controller_spec.rb

@@ -20,21 +20,13 @@ describe Admin::UsersController, "rough port of the old functional test" do
       assert_template_has 'users'
     end
 
-    def test_list
-      get :list
-      assert_template 'index'
-      assert_template_has 'users'
-    end
-
     def test_new
       get :new
       assert_template 'new'
 
       post :new, :user => { :login => 'errand', :email => 'corey@test.com',
         :password => 'testpass', :password_confirmation => 'testpass', :profile_id => 1 }
-      assert_response :redirect, :action => 'index'
-      follow_redirect
-      assert_template 'index'
+      response.should redirect_to(:action => 'index')
     end
 
     def test_edit
@@ -46,9 +38,18 @@ describe Admin::UsersController, "rough port of the old functional test" do
       post :edit, :id => user_id, :user => { :login => 'errand',
         :email => 'corey@test.com', :password => 'testpass',
         :password_confirmation => 'testpass' }
-      assert_response :redirect, :action => 'index'
-      follow_redirect
-      assert_template 'index'
+      response.should redirect_to(:action => 'index')
+    end
+
+    it 'should edit himself if no params[:id]' do
+      get :edit
+      assert_template 'edit'
+      assert_valid assigns(:user)
+
+      post :edit, :user => { :login => 'errand',
+        :email => 'corey@test.com', :password => 'testpass',
+        :password_confirmation => 'testpass' }
+      response.should redirect_to(:action => 'index')
     end
 
     def test_destroy
@@ -59,9 +60,7 @@ describe Admin::UsersController, "rough port of the old functional test" do
 
       assert_equal user_count, User.count
       post :destroy, :id => users(:bob).id
-      assert_response :redirect, :action => 'list'
-      follow_redirect
-      assert_template 'index'
+      response.should redirect_to(:action => 'index')
       assert_equal user_count - 1, User.count
     end
   end
@@ -73,18 +72,18 @@ describe Admin::UsersController, "rough port of the old functional test" do
     end
 
     it "don't see the list of user" do
-      get :list
+      get :index
       response.should redirect_to(:action => 'edit')
     end
 
     it 'become a Typo admin' do
       post :edit, :id => users(:user_publisher).id, :profile_id => profiles(:admin).id
-      response.should redirect_to(:action => 'list')
+      response.should redirect_to(:action => 'index')
     end
     
     it 'try update another user' do
       post :edit, :id => users(:tobi).id, :profile_id => profiles(:contributor).id
-      response.should redirect_to(:action => 'list')
+      response.should redirect_to(:action => 'index')
       u = users(:tobi).reload
       u.profile_id.should == profiles(:admin).id
     end

data/spec/controllers/articles_controller_spec.rb

@@ -32,12 +32,14 @@ describe 'ArticlesController' do
   it 'index' do
     get 'index'
     response.should render_template(:index)
-    assigns[:pages].should_not be_nil
     assigns[:articles].should_not be_nil
   end
 end
 
 describe ArticlesController, "feeds" do
+  
+  integrate_views
+
   before do
     @mock = mock('everything', :null_object => true)
     Category.stub!(:find_by_permalink).and_return(@mock)
@@ -55,6 +57,7 @@ describe ArticlesController, "feeds" do
     get 'index', :format => 'rss'
     response.should be_success
     response.should render_template("_rss20_feed")
+    response.should have_tag('link', 'http://test.host/articles.rss')
   end
 
   def scoped_getter

data/spec/controllers/authors_controller_spec.rb

@@ -45,9 +45,6 @@ describe AuthorsController, '/articles/category/foo' do
     User.stub!(:find_by_permalink) \
       .and_return(@author)
 
-    ActionController::Pagination::Paginator.stub!(:new) \
-      .and_return(mock('pages', :null_object => true))
-
     controller.stub!(:template_exists?) \
       .and_return(true)
     this_blog = Blog.default
@@ -90,13 +87,13 @@ describe AuthorsController, '/articles/category/foo' do
   end
 
   it 'should render an error when the author has no articles' do
-    @author.should_receive(:published_articles) \
+    @author.should_receive(:articles) \
       .and_return([])
 
     do_get
 
-    response.should render_template('articles/error')
-    assigns[:message].should == "Can't find any articles for 'foo'"
+    response.status.should == "301 Moved Permanently"
+    response.should redirect_to(Blog.default.base_url)
   end
 
   it 'should render the atom feed for /articles/author/foo.atom' do

data/spec/controllers/backend_controller_spec.rb

@@ -11,6 +11,10 @@ require 'base64'
 # Re-raise errors caught by the controller.
 class BackendController; def rescue_action(e) raise e end; end
 
+BackendController.class_eval do
+  include ActionWebService::Protocol::XmlRpc
+end
+
 describe BackendController do
   include FlexMock::TestCase
 
@@ -30,7 +34,7 @@ describe BackendController do
     args = [ 'foo', 'tobi', 'whatever' ]
 
     result = invoke_layered :blogger, :getUsersBlogs, *args
-    assert_equal result.first['blogName'], 'test blog'
+    assert_equal 'test blog', result.first['blogName']
   end
 
   def test_blogger_get_user_info
@@ -142,7 +146,7 @@ describe BackendController do
     assert_equal article.title, new_article.title
     assert_equal article.body, new_article.body
     assert_equal "<p>this is a <strong>test</strong></p>", new_article.html(:body)
-    assert_equal Time.now.midnight.utc, new_article.published_at.utc
+    assert_equal article.published_at, new_article.published_at.utc
   end
 
   # TODO: Work out what the correct response is when a post can't be saved...
@@ -179,7 +183,7 @@ describe BackendController do
     assert_equal "<p>body</p>", new_post.html(:body)
     assert_equal article.extended, new_post.extended
     assert_equal "<p>extend me</p>", new_post.html(:extended)
-    assert_equal Time.now.midnight.utc, new_post.published_at.utc
+    assert_equal article.published_at, new_post.published_at.utc
   end
 
   def test_meta_weblog_new_unpublished_post_with_blank_creation_date
@@ -232,6 +236,25 @@ describe BackendController do
     assert_raise(XMLRPC::FaultException) { invoke_layered :metaWeblog, :getRecentPosts, *args }
   end
 
+  def test_meta_weblog_should_preserve_date_time_on_roundtrip_edit
+    # The XML-RPC spec and the MetaWeblog API are ambiguous about how to
+    # intrepret the timezone in the dateCreated field.  But _however_ we
+    # interpret it, we want to be able to fetch an article from the server,
+    # edit it, and write it back to the server without changing its
+    # dateCreated field.
+    article = contents(:article1)
+    original_published_at = article.published_at
+
+    args = [ article.id, 'tobi', 'whatever' ]
+    result = invoke_layered :metaWeblog, :getPost, *args
+    assert_equal original_published_at, result['dateCreated'].to_time
+
+    args = [ article.id, 'tobi', 'whatever', result, 1 ]
+    result = invoke_layered :metaWeblog, :editPost, *args
+    article.reload
+    assert_equal original_published_at, article.published_at
+  end
+
   # Movable Type Tests
 
   def test_mt_get_category_list

data/spec/controllers/categories_controller_spec.rb

@@ -45,9 +45,6 @@ describe CategoriesController, '/articles/category/foo' do
     Category.stub!(:find_by_permalink) \
       .and_return(@category)
 
-    ActionController::Pagination::Paginator.stub!(:new) \
-      .and_return(mock('pages', :null_object => true))
-
     controller.stub!(:template_exists?) \
       .and_return(true)
     this_blog = Blog.default
@@ -90,13 +87,13 @@ describe CategoriesController, '/articles/category/foo' do
   end
 
   it 'should render an error when the category is empty' do
-    @category.should_receive(:published_articles) \
+    @category.should_receive(:articles) \
       .and_return([])
 
     do_get
 
-    response.should render_template('articles/error')
-    assigns[:message].should == "Can't find any articles for 'foo'"
+    response.status.should == "301 Moved Permanently"
+    response.should redirect_to(Blog.default.base_url)
   end
 
   it 'should render the atom feed for /articles/category/foo.atom' do