test/datasets/pages_with_positions.rb @@ -1,25 +1,120 @@ +# I think this is the one that should be moved to the extension Rakefile template + +# In rails 1.2, plugins aren't available in the path until they're loaded. +# Check to see if the rspec plugin is installed first and require +# it if it is. If not, use the gem version. + +# Determine where the RSpec plugin is by loading the boot +unless defined? RADIANT_ROOT + ENV["RAILS_ENV"] = "test" + case + when ENV["RADIANT_ENV_FILE"] + require File.dirname(ENV["RADIANT_ENV_FILE"]) + "/boot" + when File.dirname(__FILE__) =~ %r{vendor/radiant/vendor/extensions} + require "#{File.expand_path(File.dirname(__FILE__) + "/../../../../../")}/config/boot" + else + require "#{File.expand_path(File.dirname(__FILE__) + "/../../../")}/config/boot" + end +end + require 'rake' -require 'rake/testtask' require 'rake/rdoctask' +require 'rake/testtask' -desc 'Default: run unit tests.' -task :default => :test +rspec_base = File.expand_path(RADIANT_ROOT + '/vendor/plugins/rspec/lib') +$LOAD_PATH.unshift(rspec_base) if File.exist?(rspec_base) +require 'spec/rake/spectask' +# require 'spec/translator' -desc 'Test the reorder extension.' -Rake::TestTask.new(:test) do |t| - t.libs << 'lib' - t.pattern = 'test/**/*_test.rb' - t.verbose = true +# Cleanup the RADIANT_ROOT constant so specs will load the environment +Object.send(:remove_const, :RADIANT_ROOT) + +extension_root = File.expand_path(File.dirname(__FILE__)) + +task :default => :spec +task :stats => "spec:statsetup" + +desc "Run all specs in spec directory" +Spec::Rake::SpecTask.new(:spec) do |t| + t.spec_opts = ['--options', "\"#{extension_root}/spec/spec.opts\""] + t.spec_files = FileList['spec/**/*_spec.rb'] +end + +namespace :spec do + desc "Run all specs in spec directory with RCov" + Spec::Rake::SpecTask.new(:rcov) do |t| + t.spec_opts = ['--options', "\"#{extension_root}/spec/spec.opts\""] + t.spec_files = FileList['spec/**/*_spec.rb'] + t.rcov = true + t.rcov_opts = ['--exclude', 'spec', '--rails'] + end + + desc "Print Specdoc for all specs" + Spec::Rake::SpecTask.new(:doc) do |t| + t.spec_opts = ["--format", "specdoc", "--dry-run"] + t.spec_files = FileList['spec/**/*_spec.rb'] + end + + [:models, :controllers, :views, :helpers].each do |sub| + desc "Run the specs under spec/#{sub}" + Spec::Rake::SpecTask.new(sub) do |t| + t.spec_opts = ['--options', "\"#{extension_root}/spec/spec.opts\""] + t.spec_files = FileList["spec/#{sub}/**/*_spec.rb"] + end + end + + # Hopefully no one has written their extensions in pre-0.9 style + # desc "Translate specs from pre-0.9 to 0.9 style" + # task :translate do + # translator = ::Spec::Translator.new + # dir = RAILS_ROOT + '/spec' + # translator.translate(dir, dir) + # end + + # Setup specs for stats + task :statsetup do + require 'code_statistics' + ::STATS_DIRECTORIES << %w(Model\ specs spec/models) + ::STATS_DIRECTORIES << %w(View\ specs spec/views) + ::STATS_DIRECTORIES << %w(Controller\ specs spec/controllers) + ::STATS_DIRECTORIES << %w(Helper\ specs spec/views) + ::CodeStatistics::TEST_TYPES << "Model specs" + ::CodeStatistics::TEST_TYPES << "View specs" + ::CodeStatistics::TEST_TYPES << "Controller specs" + ::CodeStatistics::TEST_TYPES << "Helper specs" + ::STATS_DIRECTORIES.delete_if {|a| a[0] =~ /test/} + end + + namespace :db do + namespace :fixtures do + desc "Load fixtures (from spec/fixtures) into the current environment's database. Load specific fixtures using FIXTURES=x,y" + task :load => :environment do + require 'active_record/fixtures' + ActiveRecord::Base.establish_connection(RAILS_ENV.to_sym) + (ENV['FIXTURES'] ? ENV['FIXTURES'].split(/,/) : Dir.glob(File.join(RAILS_ROOT, 'spec', 'fixtures', '*.{yml,csv}'))).each do |fixture_file| + Fixtures.create_fixtures('spec/fixtures', File.basename(fixture_file, '.*')) + end + end + end + end end -desc 'Generate documentation for the reorder extension.' +desc 'Generate documentation for the upcoming_events extension.' Rake::RDocTask.new(:rdoc) do |rdoc| rdoc.rdoc_dir = 'rdoc' - rdoc.title = 'ReorderExtension' + rdoc.title = 'UpcomingEventsExtension' rdoc.options << '--line-numbers' << '--inline-source' rdoc.rdoc_files.include('README') rdoc.rdoc_files.include('lib/**/*.rb') end +# For extensions that are in transition +desc 'Test the upcoming_events extension.' +Rake::TestTask.new(:test) do |t| + t.libs << 'lib' + t.pattern = 'test/**/*_test.rb' + t.verbose = true +end + # Load any custom rakefiles for extension Dir[File.dirname(__FILE__) + '/tasks/*.rake'].sort.each { |f| require f } \ No newline at end of file Rakefile @@ -3,8 +3,7 @@ require File.dirname(__FILE__) + "/../test_helper" Admin::PagesController.class_eval { def rescue_action(e); raise(e); end } class PagesControllerExtensions < Test::Unit::TestCase - fixtures :pages - test_helper :login, :page, :difference + dataset :users, :pages_with_positions def setup @controller = Admin::PagesController.new @@ -14,7 +13,7 @@ class PagesControllerExtensions < Test::Unit::TestCase end def test_move_higher - assert_difference pages(:documentation), :position, -1 do + assert_difference 'pages(:documentation).position', -1 do post :move_higher, :id => pages(:documentation).id assert_response :redirect assert_equal pages(:documentation).id, assigns(:page).id @@ -23,7 +22,7 @@ class PagesControllerExtensions < Test::Unit::TestCase end def test_move_lower - assert_difference pages(:documentation), :position, 1 do + assert_difference 'pages(:documentation).position', 1 do post :move_lower, :id => pages(:documentation).id assert_response :redirect assert_equal pages(:documentation).id, assigns(:page).id @@ -42,7 +41,7 @@ class PagesControllerExtensions < Test::Unit::TestCase post :move_to_bottom, :id => pages(:documentation).id assert_response :redirect assert_equal pages(:documentation).id, assigns(:page).id - assert_equal 21, assigns(:page).position + assert_equal 6, assigns(:page).position end def test_requires_login test/functional/pages_controller_extensions_test.rb @@ -4,16 +4,15 @@ unless defined? RADIANT_ROOT ENV["RAILS_ENV"] = "test" require "#{File.expand_path(File.dirname(__FILE__) + "/../../../../")}/config/environment" end -require "#{RADIANT_ROOT}/test/test_helper" +require 'dataset' class Test::Unit::TestCase - - # Include a helper to make testing Radius tags easier - test_helper :extension_tags - - # Add the fixture directory to the fixture path - self.fixture_path << File.dirname(__FILE__) + "/fixtures" - - # Add more helper methods to be used by all extension tests here... - -end \ No newline at end of file + include Dataset + datasets_directory "#{RADIANT_ROOT}/spec/datasets" + Dataset::Resolver.default << "#{File.expand_path(File.dirname(__FILE__) + "/datasets")}" + + # for login_as helper + def request + @request + end +end test/test_helper.rb @@ -1,12 +1,16 @@ require File.dirname(__FILE__) + "/../test_helper" class PageExtensionsTest < Test::Unit::TestCase - fixtures :pages - test_helper :page + dataset :pages_with_positions def setup + Page.delete_all + pages.load + load = dataset_session.load_datasets_for(self.class) + extend_from_dataset_load(load) + @page = Page.new - @pages = pages(:homepage).children + @pages = pages(:home).children end def test_should_add_acts_as_list_methods @@ -27,47 +31,47 @@ class PageExtensionsTest < Test::Unit::TestCase end def test_should_return_children_in_position_order - assert_equal pages(:homepage).children, pages(:homepage).children.sort_by(&:position) + assert_equal pages(:home).children, pages(:home).children.sort_by(&:position) end def test_should_swap_with_top_when_next_to_top - assert_equal [[1, 4], [2, 2]], order_map(@pages.to_a)[0..1] + assert_equal [[1, "Page A"], [2, "Documentation"]], order_map(@pages.to_a)[0..1] @page = pages(:documentation) @page.move_higher @pages.reload - assert_equal [[1, 2], [2, 4]], order_map(@pages.to_a)[0..1] + assert_equal [[1, "Documentation"], [2, "Page A"]], order_map(@pages.to_a)[0..1] assert @pages[1..-1].all?{|p| p.position.to_i != 1} end def test_should_swap_with_top_when_next_to_top_and_moving_to_top - assert_equal [[1, 4], [2, 2]], order_map(@pages.to_a)[0..1] + assert_equal [[1, "Page A"], [2, "Documentation"]], order_map(@pages.to_a)[0..1] @page = pages(:documentation) @page.move_to_top @pages.reload - assert_equal [[1, 2], [2, 4]], order_map(@pages.to_a)[0..1] + assert_equal [[1, "Documentation"], [2, "Page A"]], order_map(@pages.to_a)[0..1] assert @pages[1..-1].all?{|p| p.position.to_i != 1} end def test_should_swap_with_bottom_when_next_to_bottom - assert_equal [[20, 60], [21, 61]], order_map(@pages.to_a)[-2..-1] - @page = pages(:devtags) + assert_equal [[5, "Page Y"], [6, "Page Z"]], order_map(@pages.to_a)[-2..-1] + @page = pages(:page_y) @page.move_lower @pages.reload - assert_equal [[20, 61], [21, 60]], order_map(@pages.to_a)[-2..-1] - assert @pages[0..-2].all?{|p| p.position.to_i != 21} + assert_equal [[5, "Page Z"], [6, "Page Y"]], order_map(@pages.to_a)[-2..-1] + assert @pages[0..-2].all?{|p| p.position.to_i != 6} end def test_should_swap_with_bottom_when_next_to_bottom_and_moving_to_bottom - assert_equal [[20, 60], [21, 61]], order_map(@pages.to_a)[-2..-1] - @page = pages(:devtags) + assert_equal [[5, "Page Y"], [6, "Page Z"]], order_map(@pages.to_a)[-2..-1] + @page = pages(:page_y) @page.move_to_bottom @pages.reload - assert_equal [[20, 61], [21, 60]], order_map(@pages.to_a)[-2..-1] - assert @pages[0..-2].all?{|p| p.position.to_i != 21} + assert_equal [[5, "Page Z"], [6, "Page Y"]], order_map(@pages.to_a)[-2..-1] + assert @pages[0..-2].all?{|p| p.position.to_i != 6} end private def order_map(coll) - coll.map {|r| [r.position, r.id]} + coll.map {|r| [r.position, r.title]} end end test/unit/page_extensions_test.rb 3bf8a97adb7d831a123c997044d94866ca8e1aed Nick Plante nap@zerosum.org http://github.com/radiant/radiant-reorder-extension/commit/2d40474a7ac8a9437c7a58d81c559d81ca23e891 2d40474a7ac8a9437c7a58d81c559d81ca23e891 2009-03-07T10:00:05-08:00 2009-03-05T07:24:54-08:00 update tests to use dataset plugin Signed-off-by: Sean Cribbs <seancribbs@gmail.com> d266f223d5cb49d0d369b88adb93de46948d620d Sean Cribbs seancribbs@gmail.com