Merge branch 'master' into rails4

Conflicts:
	app/helpers/refinery/blog/controller_helper.rb
	app/models/refinery/blog/post.rb

1 files changed, 4 insertions, 2 deletions

diff --git a/spec/models/refinery/blog/post_spec.rb b/spec/models/refinery/blog/post_spec.rb
index 49bfecd..8b156cb 100644
--- a/spec/models/refinery/blog/post_spec.rb
+++ b/spec/models/refinery/blog/post_spec.rb
@@ -42,8 +42,10 @@ module Refinery
         it "acts as taggable" do
           post.should respond_to(:tag_list)
 
-          #the factory has default tags, including 'chicago'
-          post.tag_list.should include("chicago")
+          post.tag_list = "refinery, cms"
+          post.save!
+
+          post.tag_list.should include("refinery")
         end
       end