Refactored everything (models, helpers) into proper namespace of Refinery::Blog. Requires refinery commit 25162b585b9c4023d39fd1a9796140bfa4ecb909

12 files changed, 313 insertions, 314 deletions

diff --git a/spec/factories/blog_categories.rb b/spec/factories/blog_categories.rb
index 9ee4f16..82f629b 100644
--- a/spec/factories/blog_categories.rb
+++ b/spec/factories/blog_categories.rb
@@ -1,5 +1,5 @@
 FactoryGirl.define do
-  factory :blog_category, :class => Refinery::BlogCategory do
+  factory :blog_category, :class => Refinery::Blog::Category do
     sequence(:title) { |n| "Shopping #{n}" }
   end
 end
diff --git a/spec/factories/blog_comments.rb b/spec/factories/blog_comments.rb
index 9818c07..e0309b2 100644
--- a/spec/factories/blog_comments.rb
+++ b/spec/factories/blog_comments.rb
@@ -1,5 +1,5 @@
 FactoryGirl.define do
-  factory :blog_comment, :class => Refinery::BlogComment do
+  factory :blog_comment, :class => Refinery::Blog::Comment do
     name "Joe Commenter"
     sequence(:email) { |n| "person#{n}@example.com" }
     body "Which one is the best for picking up new shoes?"
diff --git a/spec/factories/blog_posts.rb b/spec/factories/blog_posts.rb
index b839d02..1ad2bd2 100644
--- a/spec/factories/blog_posts.rb
+++ b/spec/factories/blog_posts.rb
@@ -1,5 +1,5 @@
 FactoryGirl.define do
-  factory :blog_post, :class => Refinery::BlogPost do
+  factory :blog_post, :class => Refinery::Blog::Post do
     sequence(:title) { |n| "Top #{n} Shopping Centers in Chicago" }
     body "These are the top ten shopping centers in Chicago. You're going to read a long blog post about them. Come to peace with it."
     draft false
diff --git a/spec/models/refinery/blog/category_spec.rb b/spec/models/refinery/blog/category_spec.rb
new file mode 100644
index 0000000..9c4a7d3
--- /dev/null
+++ b/spec/models/refinery/blog/category_spec.rb
@@ -0,0 +1,42 @@
+require 'spec_helper'
+
+module Refinery
+  module Blog
+    describe Category do
+      let(:category) { FactoryGirl.create(:blog_category) }
+
+      describe "validations" do
+        it "requires title" do
+          FactoryGirl.build(:blog_category, :title => "").should_not be_valid
+        end
+
+        it "won't allow duplicate titles" do
+          FactoryGirl.build(:blog_category, :title => category.title).should_not be_valid
+        end
+      end
+
+      describe "blog posts association" do
+        it "has a posts attribute" do
+          category.should respond_to(:posts)
+        end
+
+        it "returns posts by published_at date in descending order" do
+          first_post = category.posts.create!({ :title => "Breaking News: Joe Sak is hot stuff you guys!!", :body => "True story.", :published_at => Time.now.yesterday })
+          latest_post = category.posts.create!({ :title => "parndt is p. okay", :body => "For a Kiwi.", :published_at => Time.now })
+
+          category.posts.first.should == latest_post
+        end
+
+      end
+
+      describe "#post_count" do
+        it "returns post count in category" do
+          2.times do
+            category.posts << FactoryGirl.create(:blog_post)
+          end
+          category.post_count.should == 2
+        end
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/spec/models/refinery/blog/comment_spec.rb b/spec/models/refinery/blog/comment_spec.rb
new file mode 100644
index 0000000..3a77100
--- /dev/null
+++ b/spec/models/refinery/blog/comment_spec.rb
@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+module Refinery
+  module Blog
+    describe Comment do
+      context "wiring up" do
+        let(:comment) { FactoryGirl.create(:blog_comment) }
+
+        it "saves" do
+          comment.should_not be_nil
+        end
+
+        it "has a blog post" do
+          comment.post.should_not be_nil
+        end
+      end
+    end
+  end
+end
diff --git a/spec/models/refinery/blog/post_spec.rb b/spec/models/refinery/blog/post_spec.rb
new file mode 100644
index 0000000..7167728
--- /dev/null
+++ b/spec/models/refinery/blog/post_spec.rb
@@ -0,0 +1,220 @@
+require 'spec_helper'
+
+module Refinery
+  module Blog
+    describe Post do
+      let(:post) { FactoryGirl.create(:blog_post) }
+
+      describe "validations" do
+        it "requires title" do
+          FactoryGirl.build(:blog_post, :title => "").should_not be_valid
+        end
+
+        it "won't allow duplicate titles" do
+          FactoryGirl.build(:blog_post, :title => post.title).should_not be_valid
+        end
+
+        it "requires body" do
+          FactoryGirl.build(:blog_post, :body => nil).should_not be_valid
+        end
+      end
+
+      describe "comments association" do
+
+        it "have a comments attribute" do
+          post.should respond_to(:comments)
+        end
+
+        it "destroys associated comments" do
+          FactoryGirl.create(:blog_comment, :blog_post_id => post.id)
+          post.destroy
+          Blog::Comment.where(:blog_post_id => post.id).should be_empty
+        end
+      end
+
+      describe "categories association" do
+        it "have categories attribute" do
+          post.should respond_to(:categories)
+        end
+      end
+
+      describe "tags" do
+        it "acts as taggable" do
+          post.should respond_to(:tag_list)
+
+          #the factory has default tags, including 'chicago'
+          post.tag_list.should include("chicago")
+        end
+      end
+
+      describe "authors" do
+        it "are authored" do
+          subject.class.instance_methods.map(&:to_sym).should include(:author)
+        end
+      end
+
+      describe "by_archive scope" do
+        before do
+          @blog_post1 = FactoryGirl.create(:blog_post, :published_at => Date.new(2011, 3, 11))
+          @blog_post2 = FactoryGirl.create(:blog_post, :published_at => Date.new(2011, 3, 12))
+
+          #2 months before
+          FactoryGirl.create(:blog_post, :published_at => Date.new(2011, 1, 10))
+        end
+
+        it "returns all posts from specified month" do
+          #check for this month
+          date = "03/2011"
+          subject.class.by_archive(Time.parse(date)).count.should be == 2
+          subject.class.by_archive(Time.parse(date)).should == [@blog_post2, @blog_post1]
+        end
+      end
+
+      describe "all_previous scope" do
+        before do
+          @blog_post1 = FactoryGirl.create(:blog_post, :published_at => Time.now - 2.months)
+          @blog_post2 = FactoryGirl.create(:blog_post, :published_at => Time.now - 1.month)
+          FactoryGirl.create(:blog_post, :published_at => Time.now)
+        end
+
+        it "returns all posts from previous months" do
+          subject.class.all_previous.count.should be == 2
+          subject.class.all_previous.should == [@blog_post2, @blog_post1]
+        end
+      end
+
+      describe "live scope" do
+        before do
+          @blog_post1 = FactoryGirl.create(:blog_post, :published_at => Time.now.advance(:minutes => -2))
+          @blog_post2 = FactoryGirl.create(:blog_post, :published_at => Time.now.advance(:minutes => -1))
+          FactoryGirl.create(:blog_post, :draft => true)
+          FactoryGirl.create(:blog_post, :published_at => Time.now + 1.minute)
+        end
+
+        it "returns all posts which aren't in draft and pub date isn't in future" do
+          subject.class.live.count.should be == 2
+          subject.class.live.should == [@blog_post2, @blog_post1]
+        end
+      end
+
+      describe "uncategorized scope" do
+        before do
+          @uncategorized_post = FactoryGirl.create(:blog_post)
+          @categorized_post = FactoryGirl.create(:blog_post)
+
+          @categorized_post.categories << FactoryGirl.create(:blog_category)
+        end
+
+        it "returns uncategorized posts if they exist" do
+          subject.class.uncategorized.should include @uncategorized_post
+          subject.class.uncategorized.should_not include @categorized_post
+        end
+      end
+
+      describe "#live?" do
+        it "returns true if post is not in draft and it's published" do
+          FactoryGirl.create(:blog_post).live?.should be_true
+        end
+
+        it "returns false if post is in draft" do
+          FactoryGirl.create(:blog_post, :draft => true).live?.should be_false
+        end
+
+        it "returns false if post pub date is in future" do
+          FactoryGirl.create(:blog_post, :published_at => Time.now.advance(:minutes => 1)).live?.should be_false
+        end
+      end
+
+      describe "#next" do
+        before do
+          FactoryGirl.create(:blog_post, :published_at => Time.now.advance(:minutes => -1))
+          @blog_post = FactoryGirl.create(:blog_post)
+        end
+
+        it "returns next article when called on current article" do
+          subject.class.last.next.should == @blog_post
+        end
+      end
+
+      describe "#prev" do
+        before do
+          FactoryGirl.create(:blog_post)
+          @blog_post = FactoryGirl.create(:blog_post, :published_at => Time.now.advance(:minutes => -1))
+        end
+
+        it "returns previous article when called on current article" do
+          subject.class.first.prev.should == @blog_post
+        end
+      end
+
+      describe "#category_ids=" do
+        before do
+          @cat1 = FactoryGirl.create(:blog_category, :id => 1)
+          @cat2 = FactoryGirl.create(:blog_category, :id => 2)
+          @cat3 = FactoryGirl.create(:blog_category, :id => 3)
+          post.category_ids = [1,2,"","",3]
+        end
+
+        it "rejects blank category ids" do
+          post.categories.count.should == 3
+        end
+
+        it "returns array of categories based on given ids" do
+          post.categories.should == [@cat1, @cat2, @cat3]
+        end
+      end
+
+      describe ".comments_allowed?" do
+        context "with Refinery::Setting comments_allowed set to true" do
+          before do
+            Refinery::Setting.set(:comments_allowed, { :scoping => 'blog', :value => true })
+          end
+
+          it "should be true" do
+            subject.class.comments_allowed?.should be_true
+          end
+        end
+
+        context "with Refinery::Setting comments_allowed set to false" do
+          before do
+            Refinery::Setting.set(:comments_allowed, { :scoping => 'blog', :value => false })
+          end
+
+          it "should be false" do
+            subject.class.comments_allowed?.should be_false
+          end
+        end
+      end
+
+      describe "custom teasers" do
+        it "should allow a custom teaser" do
+          FactoryGirl.create(:blog_post, :custom_teaser => 'This is some custom content').should be_valid
+        end
+      end
+
+      describe ".teasers_enabled?" do
+        context "with Refinery::Setting teasers_enabled set to true" do
+          before do
+            Refinery::Setting.set(:teasers_enabled, { :scoping => 'blog', :value => true })
+          end
+
+          it "should be true" do
+            subject.class.teasers_enabled?.should be_true
+          end
+        end
+
+        context "with Refinery::Setting teasers_enabled set to false" do
+          before do
+            Refinery::Setting.set(:teasers_enabled, { :scoping => 'blog', :value => false })
+          end
+
+          it "should be false" do
+            subject.class.teasers_enabled?.should be_false
+          end
+        end
+
+      end
+
+    end
+  end
+end
\ No newline at end of file
diff --git a/spec/models/refinery/blog_category_spec.rb b/spec/models/refinery/blog_category_spec.rb
deleted file mode 100644
index 704b6bb..0000000
--- a/spec/models/refinery/blog_category_spec.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-require 'spec_helper'
-
-module Refinery
-  describe BlogCategory do
-    before(:each) do
-      @blog_category = FactoryGirl.create(:blog_category)
-    end
-
-    describe "validations" do
-      it "requires title" do
-        FactoryGirl.build(:blog_category, :title => "").should_not be_valid
-      end
-
-      it "won't allow duplicate titles" do
-        FactoryGirl.build(:blog_category, :title => @blog_category.title).should_not be_valid
-      end
-    end
-
-    describe "blog posts association" do
-      it "has a posts attribute" do
-        @blog_category.should respond_to(:posts)
-      end
-
-      it "returns posts by published_at date in descending order" do
-        first_post = @blog_category.posts.create!({ :title => "Breaking News: Joe Sak is hot stuff you guys!!", :body => "True story.", :published_at => Time.now.yesterday })
-        latest_post = @blog_category.posts.create!({ :title => "parndt is p. okay", :body => "For a Kiwi.", :published_at => Time.now })
-
-        @blog_category.posts.first.should == latest_post
-      end
-
-    end
-
-    describe "#post_count" do
-      it "returns post count in category" do
-        2.times do
-          @blog_category.posts << FactoryGirl.create(:blog_post)
-        end
-        @blog_category.post_count.should == 2
-      end
-    end
-  end
-end
diff --git a/spec/models/refinery/blog_comment_spec.rb b/spec/models/refinery/blog_comment_spec.rb
deleted file mode 100644
index 57c90e8..0000000
--- a/spec/models/refinery/blog_comment_spec.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-require 'spec_helper'
-
-module Refinery
-  describe BlogComment do
-
-    context "wiring up" do
-
-      before(:each) do
-        @comment = FactoryGirl.create(:blog_comment)
-      end
-
-      it "saves" do
-        @comment.should_not be_nil
-      end
-
-      it "has a blog post" do
-        @comment.post.should_not be_nil
-      end
-
-    end
-  end
-end
diff --git a/spec/models/refinery/blog_post_spec.rb b/spec/models/refinery/blog_post_spec.rb
deleted file mode 100644
index 15f8593..0000000
--- a/spec/models/refinery/blog_post_spec.rb
+++ /dev/null
@@ -1,218 +0,0 @@
-require 'spec_helper'
-
-module Refinery
-  describe BlogPost do    
-    let(:blog_post) { FactoryGirl.create(:blog_post) }
-
-    describe "validations" do
-      it "requires title" do
-        FactoryGirl.build(:blog_post, :title => "").should_not be_valid
-      end
-
-      it "won't allow duplicate titles" do
-        FactoryGirl.build(:blog_post, :title => blog_post.title).should_not be_valid
-      end
-
-      it "requires body" do
-        FactoryGirl.build(:blog_post, :body => nil).should_not be_valid
-      end
-    end
-
-    describe "comments association" do
-
-      it "have a comments attribute" do
-        blog_post.should respond_to(:comments)
-      end
-
-      it "destroys associated comments" do
-        FactoryGirl.create(:blog_comment, :blog_post_id => blog_post.id)
-        blog_post.destroy
-        BlogComment.find_by_blog_post_id(blog_post.id).should == nil
-      end
-    end
-
-    describe "categories association" do
-      it "have categories attribute" do
-        blog_post.should respond_to(:categories)
-      end
-    end
-
-    describe "tags" do
-      it "acts as taggable" do
-        blog_post.should respond_to(:tag_list)
-
-        #the factory has default tags, including 'chicago'
-        blog_post.tag_list.should include("chicago")
-      end
-    end
-
-    describe "authors" do
-      it "are authored" do
-        BlogPost.instance_methods.map(&:to_sym).should include(:author)
-      end
-    end
-
-    describe "by_archive scope" do
-      before do
-        @blog_post1 = FactoryGirl.create(:blog_post, :published_at => Date.new(2011, 3, 11))
-        @blog_post2 = FactoryGirl.create(:blog_post, :published_at => Date.new(2011, 3, 12))
-
-        #2 months before
-        FactoryGirl.create(:blog_post, :published_at => Date.new(2011, 1, 10))
-      end
-
-      it "returns all posts from specified month" do
-        #check for this month
-        date = "03/2011"
-        BlogPost.by_archive(Time.parse(date)).count.should be == 2
-        BlogPost.by_archive(Time.parse(date)).should == [@blog_post2, @blog_post1]
-      end
-    end
-
-    describe "all_previous scope" do
-      before do
-        @blog_post1 = FactoryGirl.create(:blog_post, :published_at => Time.now - 2.months)
-        @blog_post2 = FactoryGirl.create(:blog_post, :published_at => Time.now - 1.month)
-        FactoryGirl.create(:blog_post, :published_at => Time.now)
-      end
-
-      it "returns all posts from previous months" do
-        BlogPost.all_previous.count.should be == 2
-        BlogPost.all_previous.should == [@blog_post2, @blog_post1]
-      end
-    end
-
-    describe "live scope" do
-      before do
-        @blog_post1 = FactoryGirl.create(:blog_post, :published_at => Time.now.advance(:minutes => -2))
-        @blog_post2 = FactoryGirl.create(:blog_post, :published_at => Time.now.advance(:minutes => -1))
-        FactoryGirl.create(:blog_post, :draft => true)
-        FactoryGirl.create(:blog_post, :published_at => Time.now + 1.minute)
-      end
-
-      it "returns all posts which aren't in draft and pub date isn't in future" do
-        BlogPost.live.count.should be == 2
-        BlogPost.live.should == [@blog_post2, @blog_post1]
-      end
-    end
-
-    describe "uncategorized scope" do
-      before do
-        @uncategorized_blog_post = FactoryGirl.create(:blog_post)
-        @categorized_blog_post = FactoryGirl.create(:blog_post)
-
-        @categorized_blog_post.categories << FactoryGirl.create(:blog_category)
-      end
-
-      it "returns uncategorized posts if they exist" do
-        BlogPost.uncategorized.should include @uncategorized_blog_post
-        BlogPost.uncategorized.should_not include @categorized_blog_post
-      end
-    end
-
-    describe "#live?" do
-      it "returns true if post is not in draft and it's published" do
-        FactoryGirl.create(:blog_post).live?.should be_true
-      end
-
-      it "returns false if post is in draft" do
-        FactoryGirl.create(:blog_post, :draft => true).live?.should be_false
-      end
-
-      it "returns false if post pub date is in future" do
-        FactoryGirl.create(:blog_post, :published_at => Time.now.advance(:minutes => 1)).live?.should be_false
-      end
-    end
-
-    describe "#next" do
-      before do
-        FactoryGirl.create(:blog_post, :published_at => Time.now.advance(:minutes => -1))
-        @blog_post = FactoryGirl.create(:blog_post)
-      end
-
-      it "returns next article when called on current article" do
-        BlogPost.last.next.should == @blog_post
-      end
-    end
-
-    describe "#prev" do
-      before do
-        FactoryGirl.create(:blog_post)
-        @blog_post = FactoryGirl.create(:blog_post, :published_at => Time.now.advance(:minutes => -1))
-      end
-
-      it "returns previous article when called on current article" do
-        BlogPost.first.prev.should == @blog_post
-      end
-    end
-
-    describe "#category_ids=" do
-      before do
-        @cat1 = FactoryGirl.create(:blog_category, :id => 1)
-        @cat2 = FactoryGirl.create(:blog_category, :id => 2)
-        @cat3 = FactoryGirl.create(:blog_category, :id => 3)
-        blog_post.category_ids = [1,2,"","",3]
-      end
-
-      it "rejects blank category ids" do
-        blog_post.categories.count.should == 3
-      end
-
-      it "returns array of categories based on given ids" do
-        blog_post.categories.should == [@cat1, @cat2, @cat3]
-      end
-    end
-
-    describe ".comments_allowed?" do
-      context "with Refinery::Setting comments_allowed set to true" do
-        before do
-          Refinery::Setting.set(:comments_allowed, { :scoping => 'blog', :value => true })
-        end
-
-        it "should be true" do
-          BlogPost.comments_allowed?.should be_true
-        end
-      end
-
-      context "with Refinery::Setting comments_allowed set to false" do
-        before do
-          Refinery::Setting.set(:comments_allowed, { :scoping => 'blog', :value => false })
-        end
-
-        it "should be false" do
-          BlogPost.comments_allowed?.should be_false
-        end
-      end
-    end
-
-    describe "custom teasers" do
-      it "should allow a custom teaser" do
-        FactoryGirl.create(:blog_post, :custom_teaser => 'This is some custom content').should be_valid
-      end
-    end
-
-    describe ".teasers_enabled?" do
-      context "with Refinery::Setting teasers_enabled set to true" do
-        before do
-          Refinery::Setting.set(:teasers_enabled, { :scoping => 'blog', :value => true })
-        end
-
-        it "should be true" do
-          BlogPost.teasers_enabled?.should be_true
-        end
-      end
-
-      context "with Refinery::Setting teasers_enabled set to false" do
-        before do
-          Refinery::Setting.set(:teasers_enabled, { :scoping => 'blog', :value => false })
-        end
-
-        it "should be false" do
-          BlogPost.teasers_enabled?.should be_false
-        end
-      end
-
-    end
-
-  end
-end
diff --git a/spec/requests/refinery/admin/blog/comments_spec.rb b/spec/requests/refinery/admin/blog/comments_spec.rb
index a0213f6..a7367e3 100644
--- a/spec/requests/refinery/admin/blog/comments_spec.rb
+++ b/spec/requests/refinery/admin/blog/comments_spec.rb
@@ -1,13 +1,13 @@
 require "spec_helper"
 
 module Refinery
-  describe "AdminBlogComments" do
+  describe "AdminBlog::Comments" do
     login_refinery_user
     
     describe "#index" do      
       context "when has no new unapproved comments" do
         before(:each) do 
-          BlogComment.delete_all
+          Blog::Comment.delete_all
           visit refinery_admin_blog_comments_path
         end          
         
@@ -44,7 +44,7 @@ module Refinery
     describe "#approved" do      
       context "when has no approved comments" do
         before(:each) do
-          BlogComment.delete_all
+          Blog::Comment.delete_all
           visit approved_refinery_admin_blog_comments_path
         end
         
@@ -76,7 +76,7 @@ module Refinery
     describe "#rejected" do      
       context "when has no rejected comments" do
         before(:each) do
-          BlogComment.delete_all
+          Blog::Comment.delete_all
           visit rejected_refinery_admin_blog_comments_path
         end
         
diff --git a/spec/requests/refinery/admin/blog/posts_spec.rb b/spec/requests/refinery/admin/blog/posts_spec.rb
index 73bdf93..08fbab9 100644
--- a/spec/requests/refinery/admin/blog/posts_spec.rb
+++ b/spec/requests/refinery/admin/blog/posts_spec.rb
@@ -1,22 +1,22 @@
 require "spec_helper"
 
 module Refinery
-  describe "AdminBlogPosts" do
+  describe "AdminBlog::Posts" do
     login_refinery_user
-  
+
     let!(:blog_category) { FactoryGirl.create(:blog_category, :title => "Video Games") }
 
     context "when no blog posts" do
-      before(:each) { Refinery::BlogPost.destroy_all }
-    
+      before(:each) { Refinery::Blog::Post.destroy_all }
+
       describe "blog post listing" do
         before(:each) { visit refinery_admin_blog_posts_path }
-      
+
         it "invites to create new post" do
           page.should have_content("There are no Blog Posts yet. Click \"Create new post\" to add your first blog post.")
         end
       end
-    
+
       describe "new blog post form" do
         before(:each) do
           visit refinery_admin_blog_posts_path
@@ -30,7 +30,7 @@ module Refinery
         it "should have Video Games" do
           page.should have_content(blog_category.title)
         end
-      
+
         describe "create blog post" do
           before(:each) do
             fill_in "Title", :with => "This is my blog post"
@@ -38,25 +38,25 @@ module Refinery
             check blog_category.title
             click_button "Save"
           end
-        
+
           it "should succeed" do
             page.should have_content("was successfully added.")
           end
 
           it "should be the only blog post" do
-            ::Refinery::BlogPost.all.size.should eq(1)
+            ::Refinery::Blog::Post.all.size.should eq(1)
           end
 
           it "should belong to me" do
-            ::Refinery::BlogPost.first.author.login.should eq(::Refinery::User.last.login)
+            ::Refinery::Blog::Post.first.author.login.should eq(::Refinery::User.last.login)
           end
 
           it "should save categories" do
-            ::Refinery::BlogPost.last.categories.count.should eq(1)
-            ::Refinery::BlogPost.last.categories.first.title.should eq(blog_category.title)
+            ::Refinery::Blog::Post.last.categories.count.should eq(1)
+            ::Refinery::Blog::Post.last.categories.first.title.should eq(blog_category.title)
           end
         end
-      
+
         describe "create blog post with tags" do
           before(:each) do
             @tag_list = "chicago, bikes, beers, babes"
@@ -65,29 +65,29 @@ module Refinery
             fill_in "Tags", :with => @tag_list
             click_button "Save"
           end
-        
+
           it "should succeed" do
             page.should have_content("was successfully added.")
           end
-        
+
           it "should be the only blog post" do
-            ::Refinery::BlogPost.all.size.should eq(1)
+            ::Refinery::Blog::Post.all.size.should eq(1)
           end
-        
+
           it "should have the specified tags" do
-            ::Refinery::BlogPost.last.tag_list.should eq(@tag_list.split(', '))
+            ::Refinery::Blog::Post.last.tag_list.should eq(@tag_list.split(', '))
           end
         end
       end
     end
-  
+
     context "when has blog posts" do
       let!(:blog_post) { FactoryGirl.create(:blog_post) }
-    
+
       describe "blog post listing" do
         before(:each) { visit refinery_admin_blog_posts_path }
-      
-        describe "edit blog post" do      
+
+        describe "edit blog post" do
           it "should succeed" do
             page.should have_content(blog_post.title)
 
@@ -111,7 +111,7 @@ module Refinery
             page.should have_content("'#{blog_post.title}' was successfully removed.")
           end
         end
-    
+
         describe "view live" do
           it "redirects to blog post in the frontend" do
             click_link "View this blog post live"
diff --git a/spec/requests/refinery/blog/posts_spec.rb b/spec/requests/refinery/blog/posts_spec.rb
index 025586c..f2c94b0 100644
--- a/spec/requests/refinery/blog/posts_spec.rb
+++ b/spec/requests/refinery/blog/posts_spec.rb
@@ -1,7 +1,7 @@
 require "spec_helper"
 
 module Refinery
-  describe "BlogPosts" do
+  describe "Blog::Posts" do
     login_refinery_user
   
     context "when has blog posts" do    
@@ -28,7 +28,7 @@ module Refinery
           @blog_post = FactoryGirl.create(:blog_post,
                                           :title => "I Love my city",
                                           :tag_list => @tag_name)
-          @tag = ::Refinery::BlogPost.tag_counts_on(:tags).first          
+          @tag = ::Refinery::Blog::Post.tag_counts_on(:tags).first          
         end
       
         it "should have one tagged post" do