Changed gemfile to depend on xapor > 0.1.5 and removed the note from …

…the readme that is now redundant due to updates

Gemfile

@@ -9,7 +9,7 @@ gem 'authlogic', "2.1.3"
 gem 'friendly_id', "3.0.2"
 gem 'sanitize', "1.2.0"
 gem 'cancan', "1.0.2"
-gem 'xapor', ">= 0.1.0"
+gem 'xapor', ">= 0.1.5"
 gem 'will_paginate', "2.3.12"
 gem 'mongrel', "1.1.6"
 
@@ -18,6 +18,7 @@ group :test do
   gem 'rspec-rails', '1.3.2'
   gem 'spork', '0.8.2'
   gem 'email_spec', "0.6.2"
+  gem 'shoulda'
 end
 
 group :cucumber do

README

@@ -1,4 +0,0 @@
-== Notes on deployment ==
-
-With the current in-memory index for xapian and the bundler setup, only the conservative spawn method works
-with passenger.

spec/controllers/comments/delete_comment_spec.rb

@@ -3,8 +3,8 @@
 describe CommentsController, "Deleting a comment" do
   before(:each) do
     @comment = mock_model(Comment, :destroy => true)
-    @comments = mock_model(Array, :find => @comment)
-    @doc_page = mock_model(DocumentationPage, :comments => @comments)
+    @doc_page = mock_model(DocumentationPage)
+    @doc_page.stub_chain(:comments, :find).and_return(@comment)
     DocumentationPage.stub!(:find).and_return(@doc_page)
   end
 

spec/models/documentation_page_spec.rb

@@ -1,15 +1,8 @@
 require 'spec_helper'
 
 describe DocumentationPage do
-  it "should not be valid without a title" do
-    page = DocumentationPage.new(:content => "Some test content")
-    page.valid?.should be_false
-  end
-
-  it "should not be valid without content" do
-    page = DocumentationPage.new(:title => "Testing title")
-    page.valid?.should be_false
-  end
+  it {should validate_presence_of(:title)}
+  it {should validate_presence_of(:content)}
 
   it "should set the position to the lowest value if no position is provided" do
     DocumentationPage.create(:title => "Test title", :content => "Some content", :position => 1)