spec/helpers/application_helper_spec.rb spec/models/page_sweeper_spec.rb spec/models/user_spec.rb spec/rcov.opts @@ -11,3 +11,5 @@ db/*.sqlite3 index/* public/javascripts/signal.js public/stylesheets/signal.css +.project +.loadpath .gitignore @@ -13,7 +13,7 @@ public # collection methods def create - flag = current_user.flags.create!(params[:flag]) + flag = current_user.flags.create(params[:flag]) flash[:notice] = if flag.new_record? "You already flagged this content!" else # success app/controllers/flags_controller.rb @@ -1,5 +1,6 @@ class PagesController < ApplicationController before_filter :require_login, :except => [:index, :show, :revision, :search] + before_filter :login_required, :only => [:destroy] before_filter :require_admin, :only => [:lock] before_filter :check_private, :only => [:show, :revision] caches_page :show @@ -91,7 +92,7 @@ class PagesController < ApplicationController format.html { redirect_to(wiki_page_url(@page)) } format.xml { render :xml => @page, :status => :created, :location => @page } else - format.html { render :action => "new" } + format.html { puts @page.errors.inspect; render :action => "new" } format.xml { render :xml => @page.errors, :status => :unprocessable_entity } end end app/controllers/pages_controller.rb @@ -17,7 +17,8 @@ module PagesHelper end def current_revision(id, version) - version == Page.find(id).version + page = Page.find(id) + page ? (version == page.version) : false end def body_input(f) app/helpers/pages_helper.rb @@ -43,8 +43,8 @@ class Page < ActiveRecord::Base def is_spam?(site) v = Viking.connect("akismet", {:api_key => site.akismet_key, :blog => site.akismet_url}) - response = v.check_comment(:comment_content => body.to_s, :comment_author => user.login.to_s, :user_ip => ip.to_s, :user_agent => agent.to_s, :referrer => referrer.to_s) - logger.info "Calling Akismet for page #{permalink} by #{user.login.to_s} using ip #{ip}: #{response[:spam]}" + response = v.check_comment(:comment_content => body.to_s, :comment_author => username.to_s, :user_ip => ip.to_s, :user_agent => agent.to_s, :referrer => referrer.to_s) + logger.info "Calling Akismet for page #{permalink} by #{username.to_s} using ip #{ip}: #{response[:spam]}" return response[:spam] end @@ -104,6 +104,9 @@ class Page < ActiveRecord::Base RAILS_DEFAULT_LOGGER.info "UNLOCKED #{self.permalink}" end + def username + user.blank? ? "anonymous" : user.login + end def self.find_all_by_wiki_word(wiki_word, site = nil) site ||= Site.find(:first) pages = site.pages.find(:all) app/models/page.rb @@ -1,5 +1,5 @@ Comparing -version <%= @v2.version %> +version <%= @v1.version %> and version <%= @v2.version %> <pre class="diff"> app/views/pages/diff.html.erb @@ -8,7 +8,7 @@ updated <%= time_ago_in_words(rev.updated_at) %> ago by <%= author(rev.user_id) %> <% if rev.respond_to?(:previous) && !rev.previous.nil? %> - <%= link_to "(Diff)", diff_page_url(@page.permalink, :v1 => rev.version, :v2 => rev.previous) %> + <%= link_to "(Diff)", diff_page_url(@page.permalink, :v1 => rev.version, :v2 => rev.previous.version) %> <% end %> </li> <% end %> app/views/pages/revisions.html.erb @@ -9,13 +9,21 @@ describe FlagsController, "a user not logged in" do controller.stub!(:current_user).and_return :false end - it "does not render 'index'" do - get :index + %w[index new].each do |action| + it "#{action} should redirect to login" do + get action + response.should redirect_to('session/new') + end + end + + it 'can not flag something' do + post :create, :flag => { :flaggable_type => 'Page', :flaggable_id => 1, :reason => 'outdated' } response.should redirect_to('session/new') end - it 'can not flag something' do - post :create, :flag => { :flaggable_type => 'Page', :flaggable_id => 1, :reason => 'outdated' } + it 'can not delete' do + delete :destroy, :id => "1" + response.should_not be_success response.should redirect_to('session/new') end end @@ -38,12 +46,40 @@ describe FlagsController, "a user logged in as normal user" do response.should redirect_to('session/new') end - it 'can flag something' do + it 'canflag something' do lambda { post :create, :flag => { :flaggable_type => 'Page', :flaggable_id => 1, :reason => 'outdated', :user_id => @user.id } response.should redirect_to('pages/hai') }.should change(Flag, :count).by(1) end + it 'can not flag same page twice' do + post :create, :flag => { :flaggable_type => 'Page', :flaggable_id => 1, :reason => 'outdated', :user_id => @user.id } + lambda { + post :create, :flag => { :flaggable_type => 'Page', :flaggable_id => 1, :reason => 'outdated', :user_id => @user.id } + #flash[:notice].should == "You already flagged this content!" + }.should_not change(Flag, :count) + end + + it "render 'new'" do + get :new, :flaggable_type => 'Page', :flaggable_id => 1 + response.should be_success + response.should render_template('new') + end + + it "render / with error if flaggable_type is not found" do + get :new, :flaggable_type => 'NotFound', :flaggable_id => 1 + response.should_not be_success + response.should redirect_to('/') + #flash[:error].should_not be_empty + end + + it "can delete a page" do + flag = @user.flags.create({ :flaggable_type => 'Page', :flaggable_id => 1, :reason => 'outdated', :user_id => @user.id }) + lambda do + delete :destroy, :id => flag + response.should redirect_to('flags') + end.should change(Flag, :count) + end end @@ -71,5 +107,31 @@ describe FlagsController, "a user logged in as admin" do }.should change(Flag, :count).by(1) end + it "render 'new'" do + get :new, :flaggable_type => 'Page', :flaggable_id => 1 + response.should be_success + response.should render_template("new") + end + it 'can not flag same page twice' do + post :create, :flag => { :flaggable_type => 'Page', :flaggable_id => 1, :reason => 'outdated', :user_id => @user.id } + lambda { + post :create, :flag => { :flaggable_type => 'Page', :flaggable_id => 1, :reason => 'outdated', :user_id => @user.id } + #flash[:notice].should == "You already flagged this content!" + }.should_not change(Flag, :count) + end + it "render / with error if flaggable_type is not found" do + get :new, :flaggable_type => 'NotFound', :flaggable_id => 1 + response.should_not be_success + response.should redirect_to('/') + #flash[:error].should_not be_empty + end + it "can delete a page" do + flag = @user.flags.create({ :flaggable_type => 'Page', :flaggable_id => 1, :reason => 'outdated', :user_id => @user.id }) + lambda do + delete :destroy, :id => flag + response.should redirect_to('flags') + end.should change(Flag, :count) + end + end spec/controllers/flags_controller_spec.rb @@ -3,7 +3,9 @@ require File.dirname(__FILE__) + "/../spec_helper" def create_page Page.create(:title => "hee haw", :body => "moop", :site_id => 1) end - +def create_delete_page + Page.create(:title => "to be delete", :body => "moop", :site_id => 1) +end describe PagesController, " with site that requires login, a user not logged in" do fixtures :sites, :pages, :page_versions, :users integrate_views @@ -12,16 +14,68 @@ describe PagesController, " with site that requires login, a user not logged in" controller.stub!(:current_user).and_return :false end + it "show all pages" do + get :index + response.should be_success + response.should render_template("index") + end + + it "shows page if it exists" do + page = create_page + page.body = "MEEP" + page.save! + + get :show, :id => page.permalink + response.should be_success + response.should render_template("show") + end + + it "redirect to session/new if page is a private page" do + page = create_page + page.private_page = true + page.save! + + get :show, :id => page.permalink + response.should_not be_success + response.should redirect_to("session/new") + + end + it "redirect to page/new (and it will in turn redirect to session/new) if showing a page that does not exist" do + get :show, :id => "unavailable" + response.should redirect_to("pages/new") + end + it "does not render 'new'" do get :new response.should redirect_to('session/new') end - it "renders 'revision'" do + it "does not render 'diff'" do page = create_page page.body = "MEEP" page.save! + get :diff, :id => page.permalink, :v1 => page.version, :v2 => page.version - 1 + response.should redirect_to('session/new') + end + + it "does not render 'revisions'" do + page = create_page + get :revisions, :id => page.permalink + response.should redirect_to('session/new') + end + + it "does not render 'edit'" do + page = create_page + get :edit, :id => page.permalink + response.should redirect_to('session/new') + end + + it "renders 'revision'" do + page = create_page + page.body = "moep MEEPp" + page.save! + get :revision, :id => page.permalink, :version => page.version - 1 response.should be_success response.should render_template("show") @@ -65,6 +119,15 @@ describe PagesController, " with site that requires login, a user not logged in" response.should redirect_to('session/new') end.should_not change(Page, :count) end + it "can not delete a page" do + page = create_delete_page + + lambda do + delete :destroy, :id => page.permalink + response.should_not be_success + response.should redirect_to('session/new') + end.should_not change(Page, :count) + end end describe PagesController, " with site that does not require login, a user not logged in" do @@ -79,11 +142,60 @@ describe PagesController, " with site that does not require login, a user not lo controller.stub!(:current_user).and_return :false end + it "show all pages" do + get :index + response.should be_success + response.should render_template("index") + end + + it "shows page if it exists" do + page = create_page + page.body = "MEEP" + page.save! + + get :show, :id => page.permalink + response.should be_success + response.should render_template("show") + end + + it "shows new page if it does not exist" do + get :show, :id => "unavailable" + response.should redirect_to("pages/new") + end + it "renders 'new'" do get :new response.should be_success end + it "shows 'diff'" do + page = create_page + page.body = "MEEP" + page.save! + + get :diff, :id => page.permalink, :v1 => page.version, :v2 => page.version - 1 + assigns(:v1).should == page.versions.find_by_version(params[:v1]) + assigns(:v2).should == page.versions.find_by_version(params[:v2]) + response.should be_success + response.should render_template("diff") + end + + it "shows 'revisions'" do + page = create_page + get :revisions, :id => page.permalink + assigns(:revisions).should == page.versions + response.should be_success + response.should render_template("revisions") + end + + it "shows 'edit'" do + page = create_page + get :edit, :id => page.permalink + assigns(:page).should == page + response.should be_success + response.should render_template("edit") + end + it "can rollback a page" do page = create_page page.body = "MEEP" @@ -113,6 +225,16 @@ describe PagesController, " with site that does not require login, a user not lo response.should redirect_to('o-hai') end.should change(Page, :count) end + + it "cannot delete a page" do + page = create_delete_page + lambda do + delete :destroy, :id => page.permalink + response.should_not be_success + response.should redirect_to('session/new') + end.should_not change(Page, :count) + end + end describe PagesController, "a user logged in as normal user" do @@ -125,12 +247,40 @@ describe PagesController, "a user logged in as normal user" do controller.stub!(:current_user).and_return users(:jeremy) end + it "show all pages" do + get :index + response.should be_success + response.should render_template("index") + end + + it "shows page if it exists" do + page = create_page + page.body = "MEEP" + page.save! + + get :show, :id => page.permalink + response.should be_success + response.should render_template("show") + end + it "shows new page if it does not exist" do + get :show, :id => "unavailable" + response.should redirect_to("pages/new") + end + it "renders 'new'" do get :new response.should be_success response.should render_template("new") end + + it "shows 'revisions'" do + page = create_page + get :revisions, :id => page.permalink + assigns(:revisions).should == page.versions + response.should be_success + response.should render_template("revisions") + end it "renders 'revision'" do page = create_page @@ -141,6 +291,25 @@ describe PagesController, "a user logged in as normal user" do response.should be_success response.should render_template("show") end + it "shows 'edit'" do + page = create_page + get :edit, :id => page.permalink + assigns(:page).should == page + response.should be_success + response.should render_template("edit") + end + + it "shows 'diff'" do + page = create_page + page.body = "MEEP" + page.save! + + get :diff, :id => page.permalink, :v1 => page.version, :v2 => page.version - 1 + assigns(:v1).should == page.versions.find_by_version(params[:v1]) + assigns(:v2).should == page.versions.find_by_version(params[:v2]) + response.should be_success + response.should render_template("diff") + end it "searches for pages" do get :search, :query => "home" @@ -181,6 +350,15 @@ describe PagesController, "a user logged in as normal user" do get :lock, :id => 'hai' response.should redirect_to('pages/home') end + it "can delete a page" do + page = create_delete_page + page.title = "to be delete" + page.save + lambda do + delete :destroy, :id => page.permalink + response.should redirect_to('pages') + end.should change(Page, :count) + end end describe PagesController, "a user logged in as admin" do @@ -191,12 +369,48 @@ describe PagesController, "a user logged in as admin" do controller.stub!(:logged_in?).and_return true controller.stub!(:current_user).and_return users(:admin) end + + it "show all pages" do + get :index + response.should be_success + response.should render_template("index") + end + + it "shows page if it exists" do + page = create_page + page.body = "MEEP" + page.save! + + get :show, :id => page.permalink + response.should be_success + response.should render_template("show") + end + it "shows new page if it does not exist" do + get :show, :id => "unavailable" + response.should redirect_to("pages/new") + end + it "renders 'new'" do get :new response.should be_success response.should render_template("new") end + + it "shows 'revisions'" do + page = create_page + get :revisions, :id => page.permalink + assigns(:revisions).should == page.versions + response.should be_success + response.should render_template("revisions") + end + it "shows 'edit'" do + page = create_page + get :edit, :id => page.permalink + assigns(:page).should == page + response.should be_success + response.should render_template("edit") + end it "renders 'revision'" do page = create_page @@ -208,6 +422,17 @@ describe PagesController, "a user logged in as admin" do response.should render_template("show") end + it "shows 'diff'" do + page = create_page + page.body = "MEEP" + page.save! + + get :diff, :id => page.permalink, :v1 => page.version, :v2 => page.version - 1 + assigns(:v1).should == page.versions.find_by_version(params[:v1]) + assigns(:v2).should == page.versions.find_by_version(params[:v2]) + response.should be_success + response.should render_template("diff") + end it "searches for pages" do get :search, :query => "home" response.should be_success @@ -256,5 +481,14 @@ describe PagesController, "a user logged in as admin" do page.reload page.should_not be_locked end + it "can delete a page" do + page = create_delete_page + page.title = "to be delete" + page.save + lambda do + delete :destroy, :id => page.permalink + response.should redirect_to('pages') + end.should change(Page, :count) + end end spec/controllers/pages_controller_spec.rb @@ -14,4 +14,72 @@ describe PagesHelper do wikified_body("hello[[there|hai]]whats[[up]]").should == "helloMONKEYSwhatsMONKEYS" end -end \ No newline at end of file +end + +describe PagesHelper do + before do + @wiki_word = "o hai" + @link_text = "test" + @perma_link = {:permalink => "o-hai"} + @class_str = "class=\"new_wiki_link\"" + end + it "links to wiki permalink if page exists" do + + Page.should_receive(:exists?).with(@perma_link).and_return true + link = wiki_link(@wiki_word, @link_text) + link.should include(@link_text) + link.should_not include(@wiki_word) + link.should_not include(@class_str) + + end + it "links to wiki permalink with proper style if page doesnot exist" do + + Page.should_receive(:exists?).with(@perma_link).and_return false + link = wiki_link(@wiki_word, @link_text) + link.should include(@link_text) + link.should_not include(@wiki_word) + link.should include(@class_str) + end + end + +describe PagesHelper do + before do + @site = mock_model(Site) + @form = mock_model(Object) + @attr = :body + self.should_receive(:site).and_return @site + end + it "should render textarea if site disable teh" do + @site.should_receive(:disable_teh).and_return true + @form.should_receive(:text_area) + text_input(@form, @attr) + end + it "should render tech if site enable teh" do + @site.should_receive(:disable_teh).and_return false + @form.should_not_receive(:text_area) + self.should_receive(:textile_editor) + text_input(@form, @attr) + end + end +describe PagesHelper do + before do + @id = 1 + @page = mock_model(Page) + @version = mock_model(Page) + @version2 = mock_model(Page) + end + it "checks existing page with same version" do + Page.should_receive(:find).with(@id).and_return @page + @page.should_receive(:version).and_return @version + current_revision(@id, @version).should == true + end + it "checks existing page with different version" do + Page.should_receive(:find).with(@id).and_return @page + @page.should_receive(:version).and_return @version2 + current_revision(@id, @version).should == false + end + it "checks non-existing page version" do + Page.should_receive(:find).with(@id).and_return nil + current_revision(@id, @version).should == false + end + end \ No newline at end of file spec/helpers/pages_helper_spec.rb @@ -5,6 +5,7 @@ describe Page, "validity" do before(:each) do @page = Page.new :site_id => 1 + @site = mock_model(Site) end it "should not be valid" do @@ -17,6 +18,19 @@ describe Page, "validity" do @page.should be_valid end + it "should not be valid if site is spam" do + @page.stub!(:is_spam?).and_return true + @page.stub!(:site).and_return @site + @site.should_receive(:akismet_key?).and_return true + @page.should_not be_valid + end + + it "should connect to viking for spam info" do + @v = mock_model(Object) + Viking.should_receive(:connect).and_return @v + @v.should_receive(:check_comment).and_return :spam => true + @page.is_spam?(@page.site).should == true + end end describe Page, "creating links" do spec/models/page_spec.rb 780fd0bb35138e2b9de47f37e8db0cd0b5b9a8e8 Ping Yu pyu@ping-yus-computer.local http://github.com/queso/signal-wiki/commit/46d4cabb2f4308f3a0a596a974ea379de13d10c1 46d4cabb2f4308f3a0a596a974ea379de13d10c1

2008-04-20T20:13:15-07:00

2008-04-19T15:08:12-07:00

improve rspec coverage, and fixed several minor bugs 645877510119deea3520e83d430be5d5b6b5b043 Josh Owens joshua.owens@gmail.com