From 17a631b88c14ac1a41b18ed4ea43e7be94ad7aa6 Mon Sep 17 00:00:00 2001 From: albert Date: Wed, 2 Feb 2011 15:57:47 -0500 Subject: [PATCH] added wiki page version func test --- .../wiki_page_versions_controller.rb | 2 ++ app/views/wiki_page_versions/index.html.erb | 0 test/factories/wiki_page.rb | 4 +-- .../wiki_page_versions_controller_test.rb | 34 +++++++++++++++++-- 4 files changed, 35 insertions(+), 5 deletions(-) create mode 100644 app/views/wiki_page_versions/index.html.erb diff --git a/app/controllers/wiki_page_versions_controller.rb b/app/controllers/wiki_page_versions_controller.rb index af59db251..0dbb6ceb9 100644 --- a/app/controllers/wiki_page_versions_controller.rb +++ b/app/controllers/wiki_page_versions_controller.rb @@ -1,4 +1,6 @@ class WikiPageVersionsController < ApplicationController def index + @search = WikiPageVersion.search(params[:search]) + @wiki_page_versions = @search.paginate(:page => params[:page]) end end diff --git a/app/views/wiki_page_versions/index.html.erb b/app/views/wiki_page_versions/index.html.erb new file mode 100644 index 000000000..e69de29bb diff --git a/test/factories/wiki_page.rb b/test/factories/wiki_page.rb index 3a624e47c..2b38885b6 100644 --- a/test/factories/wiki_page.rb +++ b/test/factories/wiki_page.rb @@ -1,5 +1,5 @@ Factory.define(:wiki_page) do |f| f.creator {|x| x.association(:user)} - f.title {|x| Faker::Lorem.words} - f.body {Faker::Lorem.sentences} + f.title {|x| Faker::Lorem.words.join(" ")} + f.body {Faker::Lorem.sentences.join(" ")} end diff --git a/test/functional/wiki_page_versions_controller_test.rb b/test/functional/wiki_page_versions_controller_test.rb index 0ee4786b6..8921e75c5 100644 --- a/test/functional/wiki_page_versions_controller_test.rb +++ b/test/functional/wiki_page_versions_controller_test.rb @@ -1,8 +1,36 @@ require 'test_helper' class WikiPageVersionsControllerTest < ActionController::TestCase - # Replace this with your real tests. - test "the truth" do - assert true + context "The wiki page versions controller" do + setup do + @user = Factory.create(:user) + CurrentUser.user = @user + CurrentUser.ip_addr = "127.0.0.1" + end + + teardown do + CurrentUser.user = nil + CurrentUser.ip_addr = nil + end + + context "index action" do + setup do + @wiki_page = Factory.create(:wiki_page) + @wiki_page.update_attributes(:body => "1 2") + @wiki_page.update_attributes(:body => "2 3") + end + + should "list all versions" do + get :index + assert_response :success + assert_not_nil(assigns(:wiki_page_versions)) + end + + should "list all versions that match the search criteria" do + get :index, {:search => {:wiki_page_id_equals => @wiki_page.id}} + assert_response :success + assert_not_nil(assigns(:wiki_page_versions)) + end + end end end