typo 5.2 → 5.2.98

data/spec/controllers/admin/tags_controller_spec.rb

@@ -5,31 +5,66 @@ 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'
+  describe 'index action' do
+    before :each do
+      get :index
+    end
+
+    it 'should be success' do
+      response.should be_success
+    end
+
+    it 'should render template index' do
+      response.should render_template('index')
+    end
+
   end
-  
-  def test_edit
-    get :edit, 'id' => contents(:article1).tags.first.id
-    assert_template 'edit'
-    assert_template_has 'tag'
-    assert_valid assigns(:tag)
+
+
+  describe 'edit action' do
+    before(:each) do
+      @tag_id = contents(:article1).tags.first.id
+      get :edit, :id => @tag_id
+    end
+
+    it 'should be success' do
+      response.should be_success
+    end
+
+    it 'should render template edit' do
+      response.should render_template('edit')
+    end
+
+    it 'should assigns value :tag' do
+      assert_valid assigns(:tag)
+    end
+
   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
+
+
+  describe 'update action' do
+
+    before :each do
+      @tag = Tag.find_by_id(contents(:article1).tags.first.id)
+      post :edit, 'id' => @tag.id, 'tag' => {:name => 'foobar', :display_name => 'Foo Bar'}
+    end
+
+    it 'should redirect to index' do
+      response.should redirect_to(:action => 'index')
+    end
+
+    it 'should update tag' do
+      @tag.reload
+      @tag.name.should == 'foobar'
+      @tag.display_name == "Foo Bar"
+    end
+
   end
   
-end
+end

data/spec/controllers/articles_controller_spec.rb

@@ -11,6 +11,8 @@ describe 'ArticlesController' do
   controller_name :articles
   Article.delete_all
 
+  integrate_views
+
   before(:each) do
     IPSocket.stub!(:getaddress).and_return do
       raise SocketError.new("getaddrinfo: Name or service not known")
@@ -29,11 +31,80 @@ describe 'ArticlesController' do
     response.should redirect_to(tags_path)
   end
 
-  it 'index' do
-    get 'index'
-    response.should render_template(:index)
+  describe 'index action' do
+    before :each do
+      get 'index'
+    end
+
+    it 'should be render template index' do
+      response.should render_template(:index)
+    end
+
+    it 'should assigns articles' do
+      assigns[:articles].should_not be_nil
+    end
+
+    it 'should have good link feed rss' do
+      response.should have_tag('head>link[href=?]','http://test.host/articles.rss')
+    end
+
+    it 'should have good link feed atom' do
+      response.should have_tag('head>link[href=?]','http://test.host/articles.atom')
+    end
+  end
+
+
+  describe '#search action' do
+
+    describe 'a valid research' do
+      before :each do
+        get 'search', :q => 'a'
+      end
+
+      it 'should render template search' do
+        response.should render_template(:search)
+      end
+
+      it 'should assigns articles' do
+        assigns[:articles].should_not be_nil
+      end
+
+      it 'should have good feed rss link' do
+        response.should have_tag('head>link[href=?]','http://test.host/search/a.rss')
+      end
+
+      it 'should have good feed atom link' do
+        response.should have_tag('head>link[href=?]','http://test.host/search/a.atom')
+      end
+
+    end
+
+    it 'should render feed rss by search' do
+      get 'search', :q => 'a', :format => 'rss'
+      response.should be_success
+      response.should render_template('articles/_rss20_feed')
+    end
+
+    it 'should render feed atom by search' do
+      get 'search', :q => 'a', :format => 'atom'
+      response.should be_success
+      response.should render_template('articles/_atom_feed')
+    end
+
+    it 'search with empty result' do
+      get 'search', :q => 'abcdefghijklmnopqrstuvwxyz'
+      response.should render_template('articles/error.html.erb')
+      assigns[:articles].should be_empty
+    end
+  end
+
+  
+  it 'archives' do
+    get 'archives'
+    response.should render_template(:archives)
     assigns[:articles].should_not be_nil
   end
+
 end
 
 describe ArticlesController, "feeds" do

data/spec/controllers/backend_controller_spec.rb

@@ -5,6 +5,7 @@ require 'action_web_service/test_invoke'
 require 'backend_controller'
 require 'blogger_service'
 require 'meta_weblog_service'
+require 'app/apis/movable_type_service.rb'
 require 'digest/sha1'
 require 'base64'
 

data/spec/controllers/categories_controller_spec.rb

@@ -2,15 +2,8 @@ require File.dirname(__FILE__) + '/../spec_helper'
 
 describe CategoriesController, "/index" do
   before(:each) do
-    Category.stub!(:find_all_with_article_counters) \
-      .and_return(mock('categories', :null_object => true))
-
     controller.stub!(:template_exists?) \
       .and_return(true)
-
-    this_blog = Blog.default
-    controller.stub!(:this_blog) \
-      .and_return(this_blog)
   end
 
   def do_get
@@ -36,24 +29,14 @@ describe CategoriesController, "/index" do
   end
 end
 
-describe CategoriesController, '/articles/category/foo' do
+describe CategoriesController, '/articles/category/personal' do
   before(:each) do
-    @category = mock('category', :null_object => true)
-    @category.stub!(:empty?) \
-      .and_return(false)
-
-    Category.stub!(:find_by_permalink) \
-      .and_return(@category)
-
     controller.stub!(:template_exists?) \
       .and_return(true)
-    this_blog = Blog.default
-    controller.stub!(:this_blog) \
-      .and_return(this_blog)
   end
 
   def do_get
-    get 'show', :id => 'foo'
+    get 'show', :id => 'personal'
   end
 
   it 'should be successful' do
@@ -63,7 +46,7 @@ describe CategoriesController, '/articles/category/foo' do
 
   it 'should call Category.find_by_permalink' do
     Category.should_receive(:find_by_permalink) \
-      .with('foo') \
+      .with('personal') \
       .and_return(mock('category', :null_object => true))
     do_get
   end
@@ -81,30 +64,41 @@ describe CategoriesController, '/articles/category/foo' do
     response.should render_template('articles/index')
   end
 
-  it 'should set the page title to "Category foo"' do
-    do_get
-    assigns[:page_title].should == 'Category foo, everything about foo'
-  end
+  it 'should show only published articles' do
+    c = categories(:personal)
+    c.articles.size.should == 4
+    c.published_articles.size.should == 3
 
-  it 'should render an error when the category is empty' do
-    @category.should_receive(:articles) \
-      .and_return([])
+    get 'show', :id => 'personal'
 
-    do_get
+    response.should be_success
+    assigns[:articles].size.should == 3
+  end
 
-    response.status.should == "301 Moved Permanently"
-    response.should redirect_to(Blog.default.base_url)
+  it 'should set the page title to "Category personal"' do
+    do_get
+    assigns[:page_title].should == 'Category personal, everything about personal'
   end
 
-  it 'should render the atom feed for /articles/category/foo.atom' do
-    get 'show', :id => 'foo', :format => 'atom'
+  it 'should render the atom feed for /articles/category/personal.atom' do
+    get 'show', :id => 'personal', :format => 'atom'
     response.should render_template('articles/_atom_feed')
   end
 
-  it 'should render the rss feed for /articles/category/foo.rss' do
-    get 'show', :id => 'foo', :format => 'rss'
+  it 'should render the rss feed for /articles/category/personal.rss' do
+    get 'show', :id => 'personal', :format => 'rss'
     response.should render_template('articles/_rss20_feed')
   end
+
+end
+
+describe CategoriesController, 'empty category life-on-mars' do
+  it 'should redirect to home when the category is empty' do
+    get 'show', :id => 'life-on-mars'
+
+    response.status.should == "301 Moved Permanently"
+    response.should redirect_to(Blog.default.base_url)
+  end
 end
 
 ## Old tests that still need conversion

data/spec/controllers/comments_controller_spec.rb

@@ -1,73 +1,23 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
-describe CommentsController, "routes" do
-  def routes
-    ActionController::Routing::Routes
-  end
-
-  def basic_result(action, method = :get)
-    return { :controller => 'comments', :article_year => '2007', :article_month => '10', :article_day => '11',
-      :article_id => 'slug', :action => action}
-  end
-
-  it "should recognize GET /2007/10/11/slug/comments" do
-    routes.recognize_path('/2007/10/11/slug/comments', :method => :get).should ==
-      basic_result('index')
-  end
-end
-
 describe "All Requests", :shared => true do
-  def do_request(method = :get, action = 'index', *args)
-    with_options(:article_year => '2007', :article_month => '10',
-                 :article_day => '11', :article_id => 'slug') do |requester|
-      requester.send(method, action, *args)
-    end
-  end
-
   before do
     @comment  = mock_model(Comment,
                   :save                       => true,
                   :author                     => 'bob',
                   :email                      => 'bob@home',
                   :url                        => 'http://bobs.home/')
-    @article  = mock_model(Article,
-                  :comments                   => @comments,
-                  :published_comments         => @comments,
-                  :add_comment                => @comment)
-    @blog     = mock_model(Blog,
-                  :sp_allow_non_ajax_comments => true,
-                  :lang                       => 'en_US',
-                  :blog_name                  => "A Blog",
-                  :theme                      => 'azure',
-                  :articles                   => @articles,
-                  :requested_article          => @article)
-
-
-    @article.stub!(:to_param).and_return(['2007', '10', '11', 'slug'])
-    Article.stub!(:find).and_return(@article)
-
-    Comment.stub!(:find).and_return(@comment)
-    Blog.stub!(:find).and_return(@blog)
-    Blog.stub!(:default).and_return(@blog)
+    @article  = contents(:article1)
+    @blog     = blogs(:default)
   end
 end
 
 describe "General Comment Creation", :shared => true do
   it_should_behave_like "All Requests"
 
-  before do
-    @article.stub!(:permalink_url).and_return('foo')
-    @article.stub!(:add_comment).and_return(@comment)
-    @comments.stub!(:build).and_return(@comment)
-    @comment.stub!(:save).and_return(true)
-    @comment.stub!(:author).and_return('bob')
-    @comment.stub!(:email).and_return('bob@home')
-    @comment.stub!(:url).and_return('http://bobs.home/')
-  end
-
   it "should assign the new comment to @comment" do
     make_the_request
-    assigns[:comment].should == @comment
+    assigns[:comment].should == Comment.find_by_author_and_body_and_article_id('bob', 'content', contents(:article1).id)
   end
 
   it "should assign the article to @article" do
@@ -76,17 +26,14 @@ describe "General Comment Creation", :shared => true do
   end
 
   it "should save the comment" do
-    @comment.should_receive(:save).and_return(true)
-    make_the_request
+    lambda do
+      make_the_request
+    end.should change(Comment, :count).by(1)
   end
 
   it "should set the author" do
-    @article.should_receive(:add_comment) do |opts|
-      opts[:author].should == 'bob'
-      @comment
-    end
-
     make_the_request
+    contents(:article1).comments.last.author.should == 'bob'
   end
 
   it "should set an author cookie" do
@@ -107,10 +54,6 @@ describe "General Comment Creation", :shared => true do
   end
 
   it "should create a comment" do
-    @blog.should_receive(:requested_article).and_return(@article)
-    @article.should_receive(:add_comment).and_return(@comment)
-    @article.should_receive(:to_param).at_least(:once).and_return(['2007', '10', '11', 'slug'])
-
     make_the_request
   end
 
@@ -120,18 +63,20 @@ describe CommentsController, 'create' do
   it_should_behave_like "General Comment Creation"
 
   def make_the_request(comment = {:body => 'content', :author => 'bob'})
-    do_request(:post, :create, :comment => comment)
+    post :create, :comment => comment, :article_id => contents(:article1).id
   end
 
   it "should throw an error if sp_allow_non_ajax_comments is false and there are no xhr headers" do
-    @blog.should_receive(:sp_allow_non_ajax_comments).and_return(false)
+    b = blogs(:default)
+    b.sp_allow_non_ajax_comments = false
+    b.save
     make_the_request
     response.response_code.should == 400
   end
 
   it "should redirect to the article" do
     make_the_request
-    response.should redirect_to('/2007/10/11/slug')
+    response.should redirect_to("#{blogs(:default).base_url}/#{contents(:article1).created_at.year}/#{sprintf("%.2d", contents(:article1).created_at.month)}/#{sprintf("%.2d", contents(:article1).created_at.day)}/#{contents(:article1).permalink}")
   end
 end
 
@@ -139,11 +84,14 @@ describe CommentsController, 'AJAX creation' do
   it_should_behave_like "General Comment Creation"
 
   def make_the_request(comment = {:body => 'content', :author => 'bob'})
-    do_request(:xhr, :post, :create, :comment => comment)
+    xhr :post, :create, :comment => comment, :article_id => contents(:article1).id
   end
 
   it "should be be successful if blog.sp_allow_non_ajax_comments is false" do
-    @blog.should_receive(:sp_allow_non_ajax_comments).and_return(false)
+    b = blogs(:default)
+    b.sp_allow_non_ajax_comments = false
+    b.save
+    b.sp_allow_non_ajax_comments.should_not be_true
     make_the_request
     response.should be_success
   end
@@ -158,18 +106,19 @@ describe CommentsController, 'scoped index' do
   it_should_behave_like "All Requests"
 
   it "GET 2007/10/11/slug/comments should redirect to /2007/10/11/slug#comments" do
-    do_request :get, 'index'
-    response.should redirect_to("/2007/10/11/slug#comments")
+    #content(:article1) => Time.now - 2 days
+    get 'index', :article_id => @article.id
+    response.should redirect_to("#{blogs(:default).base_url}/#{contents(:article1).created_at.year}/#{sprintf("%.2d", contents(:article1).created_at.month)}/#{sprintf("%.2d", contents(:article1).created_at.day)}/#{contents(:article1).permalink}#comments")
   end
 
   it "GET /2007/10/11/slug/comments.atom should return an atom feed" do
-    do_request :get, 'index', :format => 'atom'
+    get :index, :format => 'atom', :article_id => contents(:article1).id
     response.should be_success
     response.should render_template("articles/_atom_feed")
   end
 
   it "GET /2007/10/11/slug/comments.rss should return an rss feed" do
-    do_request :get, 'index', :format => 'rss'
+    get :index, :format => 'rss', :article_id => contents(:article1).id
     response.should be_success
     response.should render_template("articles/_rss20_feed")
   end
@@ -197,7 +146,7 @@ describe CommentsController, "GET /comments.:format" do
     response.should render_template("articles/_atom_feed")
   end
 
-  it ":format => 'rss' should return an rss feed" do
+  it ":format => 'rss' should return an rss feed"do
     get 'index', :format => 'rss'
     response.should be_success
     response.should render_template("articles/_rss20_feed")