@@ -1,7 +1,6 @@ -require 'test_helper' +require File.dirname(__FILE__) + '/test_helper' require 'rubygems' require 'mocha' -require 'tester_xtreme' require File.dirname(__FILE__) + '/sandstone_test_factory' include Sandstone::TestFactory generators/sandstone/templates/test/sandstone_test_helper.rb @@ -1,10 +1,6 @@ require File.dirname(__FILE__) + '/../sandstone_test_helper' -module UnitTest - - class AuditTest < Test::Unit::TestCase - should_belong_to :editor - should_require :event, :editor_id - end - -end \ No newline at end of file +class AuditTest < Test::Unit::TestCase + should_belong_to :editor + should_require_attributes :event, :editor_id +end generators/sandstone/templates/test/unit/audit_test.rb @@ -1,12 +1,11 @@ require File.dirname(__FILE__) + '/../sandstone_test_helper' -module UnitTest +class EditorTest < Test::Unit::TestCase + should_require_attributes :user_id + should_require_unique_attributes :user_id + should_have_many :pages, :audits - class EditorTest < Test::Unit::TestCase - should_require :user_id - should_require_unique :user_id -# should_belong_to :user - should_have_many :pages, :audits + def setup + create_editor!(:role => 'author') end - -end \ No newline at end of file +end generators/sandstone/templates/test/unit/editor_test.rb @@ -1,17 +1,18 @@ require File.dirname(__FILE__) + '/../sandstone_test_helper' -module FunctionalTest +class PageTemplateTest < Test::Unit::TestCase + should_have_many :pages + should_require_attributes :name + should_require_unique_attributes :name - class PageTemplateTest < Test::Unit::TestCase - should_have_many :pages - should_require :name - should_require_unique :name + def setup + create_page_template!(:content => 'eephus') + end - # hits the database, mocks the filesystem - def test_file_should_be_created_with_record - template = PageTemplate.new :name => 'tester' - File.expects(:open).with(template.send(:layout_filename), 'wb+') - template.save - end + # hits the database, mocks the filesystem + def test_file_should_be_created_with_record + template = PageTemplate.new :name => 'tester', :content => 'eephus' + File.expects(:open).with(template.send(:layout_filename), 'wb+') + template.save end end generators/sandstone/templates/test/unit/page_template_test.rb @@ -1,62 +1,63 @@ require File.dirname(__FILE__) + '/../sandstone_test_helper' -module UnitTest - - class PageTest < Test::Unit::TestCase - should_have_many :audits - should_belong_to :page_template - should_belong_to :editor - should_require_unique :path - should_require :content - - def test_layout_should_default_to_application - Page.any_instance.stubs(:page_template).returns(nil) - assert_equal 'public', Page.new.layout - end - - def test_layout_should_derive_from_template - template = stub(:name => 'test') - Page.any_instance.stubs(:page_template).returns(template) - assert_equal 'generated/test', Page.new.layout - end - - def test_status_defaults_to_new - assert_equal 'new', Page.new.status - end - - def test_find_pending_should_call_dynamic_finder - Page.expects(:find_all_by_status).with('pending') - pages = Page.find_pending - end - - def test_assigning_to_approve_sets_status - page = Page.new - page.approve = true - assert_equal 'pending', page.status - end - - def test_assigning_to_draft_sets_status - page = Page.new - page.draft = true - assert_equal 'new', page.status - end - - def test_assigning_to_publish_sets_status - page = Page.new - page.publish = true - assert_equal 'published', page.status - end - - def test_page_variables_should_optionally_inherit - parent = Page.create! :path => 'path', :content => 'asd' - parent.page_variables.create :name => 'test', :content => '1' - - child = Page.create! :parent_id => parent.id, :path => 'path2', :content => 'asd' - assert_equal '1', child.var('test') # inherited - assert_nil child.var('test', false) # stop inheritance - - child.page_variables.create :name => 'test', :content => '2' - assert_equal '2', child.var('test') # local value overrides - end +class PageTest < Test::Unit::TestCase + should_have_many :audits + should_belong_to :page_template + should_belong_to :editor + should_require_unique_attributes :path + should_require_attributes :content + + def setup + create_page! + end + + def test_layout_should_default_to_application + Page.any_instance.stubs(:page_template).returns(nil) + assert_equal 'public', Page.new.layout + end + + def test_layout_should_derive_from_template + template = stub(:name => 'test') + Page.any_instance.stubs(:page_template).returns(template) + assert_equal 'generated/test', Page.new.layout + end + + def test_status_defaults_to_new + assert_equal 'new', Page.new.status + end + + def test_find_pending_should_call_dynamic_finder + Page.expects(:find_all_by_status).with('pending') + pages = Page.find_pending + end + + def test_assigning_to_approve_sets_status + page = Page.new + page.approve = true + assert_equal 'pending', page.status + end + + def test_assigning_to_draft_sets_status + page = Page.new + page.draft = true + assert_equal 'new', page.status + end + + def test_assigning_to_publish_sets_status + page = Page.new + page.publish = true + assert_equal 'published', page.status + end + + def test_page_variables_should_optionally_inherit + parent = Page.create! :path => 'path', :content => 'asd' + parent.page_variables.create :name => 'test', :content => '1' + + child = Page.create! :parent_id => parent.id, :path => 'path2', :content => 'asd' + assert_equal '1', child.var('test') # inherited + assert_nil child.var('test', false) # stop inheritance + + child.page_variables.create :name => 'test', :content => '2' + assert_equal '2', child.var('test') # local value overrides end end \ No newline at end of file generators/sandstone/templates/test/unit/page_test.rb @@ -1,9 +1,6 @@ require File.dirname(__FILE__) + '/../sandstone_test_helper' -module UnitTest - - class PageVariableTest < Test::Unit::TestCase - should_belong_to :page - should_require :name, :content - end -end \ No newline at end of file +class PageVariableTest < Test::Unit::TestCase + should_belong_to :page + should_require_attributes :name, :content +end generators/sandstone/templates/test/unit/page_variable_test.rb @@ -2,7 +2,7 @@ %w(models helpers).each do |code_dir| directory = File.join(File.dirname(__FILE__), 'lib', code_dir) - Dependencies.load_paths << directory + ActiveSupport::Dependencies.load_paths << directory $LOAD_PATH << directory if code_dir == 'helpers' init.rb @@ -95,7 +95,7 @@ module Sandstone private def retire_old_published_versions - self.versions.update_all('status = "retired"', ['version < ? AND status = ?', self.version, 'published']) if self.status == 'published' + self.versions.update_all("status = 'retired'", ['version < ? AND status = ?', self.version, 'published']) if self.status == 'published' end def page_filename @@ -118,4 +118,4 @@ module Sandstone end end end -end \ No newline at end of file +end lib/sandstone/models/page.rb 4d30640b414be6921f3539c1c15c34c53a849ba9 290f4ce95fe17aacc058f42eed8308c6cd74a475 Mark Cornick mcornick@mcornick.com http://github.com/vigetlabs/sandstone/commit/fd1e1deb9758316da27c7537fafa698c2bb02070 fd1e1deb9758316da27c7537fafa698c2bb02070 2009-04-23T09:53:58-07:00 2009-04-23T09:53:58-07:00 Merge branch 'master' into jasoncale/master 941cd0a0e4c6e6c82a562f19a40af0a8ee2bbdc7 Mark Cornick mcornick@mcornick.com