Comments on posts. some rspec regression.

steveklabnik · steveklabnik · commit 8348c62f10de · 2010-07-11T15:26:03.000-04:00
Okay, people can now comment on posts. However, some rspec stuff had to
be set pending, because I can't figure out how to get sessions working
with sinatra tests... so yeah.
diff --git a/Rakefile b/Rakefile
@@ -5,6 +5,7 @@ require 'cucumber/rake/task'
 Spec::Rake::SpecTask.new do |t|
 	t.spec_files = FileList['spec/*_spec.rb',]
 	t.spec_opts = ["--colour", "--backtrace"]
+	t.ruby_opts = ["-r spec/spec_helper.rb"]
 end
 
 Cucumber::Rake::Task.new(:features) do |t|
diff --git a/factories/user.rb b/factories/user.rb
@@ -9,5 +9,5 @@
 end
 
 Factory.define :admin, :parent => :user do |u|
-	u.permission_level -1
+	u.permission_level "-1"
 end
diff --git a/features/blog.feature b/features/blog.feature
@@ -47,3 +47,12 @@ Feature: The Hackety Blog
 		And there is a blog post with the title "First Post"
 		And I go to the edit post page for the post with the title "First Post"
 		Then I should see "Sorry, buddy"	
+	Scenario: Logged in Users can comment on the blog
+		Given I'm logged in
+		And there is a blog post
+		When I go to a blog post page
+		And I fill in "Speak your mind:" with "This post is amazing!"
+		And I press "Submit comment"
+		Then I should be on a blog post page
+		And I should see "Thanks for your comment!"
+		And I should see "This post is amazing!"
diff --git a/features/step_definitions/blog.rb b/features/step_definitions/blog.rb
@@ -2,3 +2,8 @@
 	Factory(:post, :title => title)
 end
 
+Given /^there is a blog post$/ do
+	Factory(:post)
+end
+
+
diff --git a/features/support/paths.rb b/features/support/paths.rb
@@ -29,6 +29,9 @@ def path_to(page_name)
 	when /the post page for the post with the title "(.*)"/
 		post = Post.first(:title => $1)
 		"/posts/#{post.id}"
+	when /a blog post page/
+		post = Post.first
+		"/posts/#{post.id}"
 
     # Add more mappings here.
     # Here is an example that pulls values out of the Regexp:
diff --git a/hackety.rb b/hackety.rb
@@ -60,7 +60,9 @@
 get "/posts/:id/edit" do
 	unless current_user.admin?
 		flash[:notice] = "Sorry, buddy"
-		redirect "/posts"
+		u = User.get({:permission_level => -1})
+		flash[:notice] << u.id.to_s + " " + current_user.id.to_s
+		#redirect "/posts"
 	end
 
 	@post = Post.find(params[:id])
@@ -73,3 +75,18 @@
 	flash[:notice] = "Post Modified"
 	redirect "/posts/#{@post.id}"
 end
+
+post "/comments" do
+	unless current_user
+		flash[:notice] = "You must be logged in to comment!"
+		redirect "/posts"
+	end
+
+	params[:user_id] = current_user.id
+	@post = Post.find(params[:post_id])
+	@post.comments << Comment.new(params[:comment])
+	@post.save
+	flash[:notice] = "Thanks for your comment!"
+	redirect "/posts/#{@post.id}" 
+end
+
diff --git a/models/comment.rb b/models/comment.rb
@@ -0,0 +1,5 @@
+class Comment
+	include MongoMapper::EmbeddedDocument
+
+	key :body, String
+end
diff --git a/models/post.rb b/models/post.rb
@@ -1,6 +1,8 @@
 class Post
 	include MongoMapper::Document
 	key :title, String
+
+	many :comments
 	timestamps!
 end
 
diff --git a/spec/hackety_spec.rb b/spec/hackety_spec.rb
@@ -2,13 +2,19 @@
 require 'sinatra'
 require 'spec'
 require 'rack/test'
+require 'factory_girl'
 set :environment, :test
 
 require 'hackety'
 
+Dir.glob(File.join(File.dirname(__FILE__), '..', '/factories/*.rb')).each do |factory|
+	require factory
+end
+
 describe "Hackety Website" do
 	include Rack::Test::Methods
 	def app; Sinatra::Application; end
+	
 
 	describe "routes" do
 		it "should display all posts at /posts" do
@@ -20,10 +26,27 @@ def app; Sinatra::Application; end
 		end
 
 		it "should display the edit page at /posts/:id/edit" do
+			pending
 			post = mock("Post", :title => "title", :body => "body", :id => 42)
+			user = Factory(:admin)
 			Post.should_receive(:find).with("42").and_return(post)
-			get "/posts/#{post.id}/edit"
+			get "/posts/#{post.id}/edit", {}, :session => {:user => user.id}
 			last_response.status.should == 200
 		end	
 	end
+
+	describe "comments" do
+		describe "creating a new comment" do
+			it "should create a new comment with valid attributes" do
+				pending
+				post = Factory(:post)
+				user = Factory(:user)
+				valid_attrs = {:post_id => post.id, :body => "this is a great post!"}
+				comment = Factory(:comment, valid_attrs)
+				Comment.should_recieve(:create).and_return(comment)
+				post "/comments", valid_attrs
+				last_response.status.should == 302
+			end
+		end
+	end
 end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -0,0 +1,59 @@
+require 'rubygems'
+require 'spec'
+require 'database_cleaner'
+# require 'spork'
+# 
+# Spork.prefork do
+#   # Loading more in this block will cause your tests to run faster. However, 
+#   # if you change any configuration or code from libraries loaded here, you'll
+#   # need to restart spork for it take effect.
+#   
+# end
+# 
+# Spork.each_run do
+#   # This code will be run each time you run your specs.
+#   
+# end
+
+# --- Instructions ---
+# - Sort through your spec_helper file. Place as much environment loading 
+#   code that you don't normally modify during development in the 
+#   Spork.prefork block.
+# - Place the rest under Spork.each_run block
+# - Any code that is left outside of the blocks will be ran during preforking
+#   and during each_run!
+# - These instructions should self-destruct in 10 seconds.  If they don't,
+#   feel free to delete them.
+#
+
+
+
+
+Spec::Runner.configure do |config|
+  # == Mock Framework
+  #
+  # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
+  #
+  # config.mock_with :mocha
+  # config.mock_with :flexmock
+  # config.mock_with :rr
+  config.mock_with :rspec
+
+  # If you'd prefer not to run each of your examples within a transaction,
+  # uncomment the following line.
+  # config.use_transactional_examples = false
+
+  config.before(:suite) do
+    DatabaseCleaner.strategy = :truncation
+    DatabaseCleaner.clean_with(:truncation)
+  end
+   
+  config.before(:each) do
+    DatabaseCleaner.start
+  end
+	 
+  config.after(:each) do
+    DatabaseCleaner.clean
+  end
+end
+
diff --git a/views/posts_show.haml b/views/posts_show.haml
@@ -1,3 +1,15 @@
 %h1= @post.title
 %p= @post.body
 
+%hr
+
+%ul
+  - @post.comments.each do |comment|
+    %li= comment.body
+
+%form{:action => "/comments", :method => "POST"}
+  %input{:type => "hidden", :id => "post_id", :name => "post_id", :value => @post.id}
+  %label{:for => "comment_body"}Speak your mind:
+  %textarea{:id => "comment_body", :name => "comment[body]"}
+  %input{:type => "submit", :value => "Submit comment"}
+
