spec/datasets/file_not_found_dataset.rb spec/datasets/home_page_dataset.rb spec/datasets/layouts_dataset.rb spec/datasets/markup_pages_dataset.rb spec/datasets/pages_dataset.rb spec/datasets/pages_with_layouts_dataset.rb spec/datasets/snippets_dataset.rb spec/datasets/users_and_pages_dataset.rb spec/datasets/users_dataset.rb vendor/plugins/dataset @@ -4,3 +4,6 @@ [submodule "vendor/plugins/vizres"] path = vendor/plugins/vizres url = git://github.com/pelargir/vizres.git +[submodule "vendor/plugins/dataset"] + path = vendor/plugins/dataset + url = git://github.com/aiwilliams/dataset.git .gitmodules @@ -18,7 +18,7 @@ end # model and the LayoutController views. # describe Admin::AbstractModelController, :type => :controller do - scenario :layouts, :users + dataset :layouts, :users test_helper :caching, :routing before :each do spec/controllers/admin/abstract_model_controller_spec.rb_ @@ -1,7 +1,7 @@ require File.dirname(__FILE__) + "/../../spec_helper" describe Admin::ExportController do - scenario :users_and_pages + dataset :users_and_pages before :each do login_as :developer spec/controllers/admin/export_controller_spec.rb @@ -1,7 +1,7 @@ require File.dirname(__FILE__) + "/../../spec_helper" describe Admin::ExtensionsController do - scenario :users + dataset :users before :each do login_as :admin spec/controllers/admin/extensions_controller_spec.rb @@ -1,7 +1,7 @@ require File.dirname(__FILE__) + "/../../spec_helper" describe Admin::LayoutsController do - scenario :users, :pages_with_layouts + dataset :users, :pages_with_layouts before :each do login_as :developer spec/controllers/admin/layouts_controller_spec.rb @@ -1,7 +1,7 @@ require File.dirname(__FILE__) + '/../../spec_helper' describe Admin::PagesController do - scenario :users, :pages + dataset :users, :pages test_helper :pages, :page_parts, :caching before :each do spec/controllers/admin/pages_controller_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper') describe Admin::PreferencesController do - scenario :users + dataset :users test_helper :logging it "should allow you to view your preferences" do spec/controllers/admin/preferences_controller_spec.rb @@ -1,7 +1,7 @@ require File.dirname(__FILE__) + '/../../spec_helper' describe Admin::ReferencesController do - scenario :users + dataset :users before :each do login_as :existing spec/controllers/admin/references_controller_spec.rb @@ -1,7 +1,7 @@ require File.dirname(__FILE__) + "/../../spec_helper" describe Admin::SnippetsController do - scenario :users, :snippets + dataset :users, :snippets before :each do ActionController::Routing::Routes.reload spec/controllers/admin/snippets_controller_spec.rb @@ -1,7 +1,7 @@ require File.dirname(__FILE__) + "/../../spec_helper" describe Admin::UsersController do - scenario :users + dataset :users test_helper :logging it "should be a ResourceController" do spec/controllers/admin/users_controller_spec.rb @@ -1,7 +1,7 @@ require File.dirname(__FILE__) + "/../../spec_helper" describe Admin::WelcomeController do - scenario :users + dataset :users it "should redirect to page tree on get to /admin/welcome" do get :index spec/controllers/admin/welcome_controller_spec.rb @@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/../spec_helper' # http://blog.davidchelimsky.net/articles/2007/06/03/oxymoron-testing-behaviour-of-abstractions describe ApplicationController do - scenario :users + dataset :users it 'should include LoginSystem' do ApplicationController.included_modules.should include(LoginSystem) spec/controllers/application_controller_spec.rb @@ -1,7 +1,7 @@ require File.dirname(__FILE__) + '/../spec_helper' describe SiteController, "routes page requests" do - scenario :pages + dataset :pages before(:each) do # don't bork results with stale cache items @@ -89,7 +89,7 @@ describe SiteController, "routes page requests" do end describe SiteController, "when custom 404 pages are defined" do - scenario :file_not_found + dataset :file_not_found it "should use the top-most published 404 page by default" do get :show_page, :url => "/foo" spec/controllers/site_controller_spec.rb @@ -5,7 +5,7 @@ class MarkdownPlusFilter end describe Admin::PagesHelper do - scenario :users_and_pages + dataset :users_and_pages before :each do @page = mock_model(Page) spec/helpers/admin/pages_helper_spec.rb @@ -1,7 +1,7 @@ require File.dirname(__FILE__) + "/../../spec_helper" describe Admin::UsersHelper do - scenario :users + dataset :users it "should render a string containing the user's roles" do helper.roles(users(:admin)).should == "Administrator" spec/helpers/admin/users_helper_spec.rb @@ -1,7 +1,7 @@ require File.dirname(__FILE__) + "/../spec_helper" describe ApplicationHelper do - scenario :users + dataset :users before :each do Radiant::Initializer.run :initialize_default_admin_tabs spec/helpers/application_helper_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper') describe 'Pages' do - scenario :users + dataset :users before do Radiant::Config['defaults.page.parts'] = 'body' @@ -26,7 +26,7 @@ describe 'Pages' do end describe "Pages as resource" do - scenario :pages, :users + dataset :pages, :users it "should require authentication" do get "/admin/pages.xml" spec/integration/admin/pages_integration_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper') describe 'User permissions' do - scenario :users + dataset :users it 'should allow administrators to login' do navigate_to '/admin/login' spec/integration/admin/permission_integration_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper') describe 'Snippets' do - scenario :users, :snippets + dataset :users, :snippets before do login :admin @@ -36,7 +36,7 @@ describe 'Snippets' do end describe 'Snippet as resource' do - scenario :users + dataset :users before do @snippet = Snippet.create!(:name => 'Snippet', :content => 'Content') spec/integration/admin/snippets_integration_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper') require 'ruby-debug' describe 'Managing users' do - scenario :users + dataset :users describe 'as non-admin' do before { login :existing } spec/integration/admin/user_management_integration_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper') describe 'User preferences' do - scenario :users + dataset :users before do login :existing spec/integration/admin/user_preferences_integration_spec.rb @@ -40,7 +40,7 @@ describe LoginRequiredController = StubController.subclass('LoginRequiredControl teardown_custom_routes end - scenario :users + dataset :users it "should authenticate with user in session" do login_as :existing @@ -90,7 +90,7 @@ describe StubController, :type => :controller do end describe "with session_token" do - scenario :users + dataset :users before do @user = users(:admin) @@ -178,7 +178,7 @@ describe LoginRequiredController.subclass('OnlyAllowAccessToWhenController') { :denied_url => '/login_required', :denied_message => 'Fun.' }, :type => :controller do - scenario :users + dataset :users test_helper :routing before :each do setup_custom_routes @@ -214,7 +214,7 @@ describe LoginRequiredController.subclass('OnlyAllowAccessToWhenDefaultsControll :denied_url => '/login_required', :denied_message => 'Fun.' }, :type => :controller do - scenario :users + dataset :users test_helper :routing before :each do setup_custom_routes @@ -239,7 +239,7 @@ describe LoginRequiredController.subclass('OnlyAllowAccessToIfController') { :denied_url => '/login_required', :denied_message => 'Fun.' }, :type => :controller do - scenario :users + dataset :users test_helper :routing before :each do setup_custom_routes spec/lib/login_system_spec.rb @@ -175,7 +175,7 @@ describe Radiant::AdminUI::TabSet do end describe Radiant::AdminUI::Tab do - scenario :users + dataset :users before :each do @tab = Radiant::AdminUI::Tab.new "Test", "/test" spec/lib/radiant/admin_ui_spec.rb @@ -120,7 +120,7 @@ describe Radiant::Taggable, "when included in a module with defined tags" do end describe Radiant::Taggable, "when included in a module with defined tags which is included in the Page model" do - scenario :users_and_pages, :file_not_found, :snippets + dataset :users_and_pages, :file_not_found, :snippets module CustomTags include Radiant::Taggable spec/lib/radiant/taggable_spec.rb @@ -1,7 +1,7 @@ require File.dirname(__FILE__) + '/../spec_helper' describe FileNotFoundPage do - scenario :file_not_found + dataset :file_not_found test_helper :render before(:each) do spec/models/file_not_found_page_spec.rb @@ -1,7 +1,7 @@ require File.dirname(__FILE__) + '/../spec_helper' describe Layout do - scenario :layouts + dataset :layouts test_helper :validations before :each do spec/models/layout_spec.rb @@ -1,7 +1,7 @@ require File.dirname(__FILE__) + '/../spec_helper' describe PageContext do - scenario :pages + dataset :pages test_helper :pages before :each do @@ -45,7 +45,7 @@ describe PageContext do end describe PageContext, "when errors are not being raised" do - scenario :pages + dataset :pages test_helper :pages before :each do spec/models/page_context_spec.rb @@ -44,7 +44,7 @@ describe PagePart do end describe PagePart, 'filter' do - scenario :markup_pages + dataset :markup_pages specify 'getting and setting' do @part = page_parts(:textile_body) spec/models/page_part_spec.rb @@ -21,7 +21,7 @@ class PageSpecTestPage < Page end describe Page, 'validations' do - scenario :pages + dataset :pages test_helper :validations before :each do @@ -103,7 +103,7 @@ describe Page, "behaviors" do end describe Page, "layout" do - scenario :pages_with_layouts + dataset :pages_with_layouts it 'should be accessible' do @page = pages(:first) @@ -119,7 +119,7 @@ describe Page, "layout" do end describe Page do - scenario :pages + dataset :pages before :each do @page = pages(:first) @@ -303,7 +303,7 @@ describe Page do end describe Page, "before save filter" do - scenario :home_page + dataset :home_page before :each do Page.create(page_params(:title =>"Month Index", :class_name => "ArchiveMonthIndexPage")) @@ -340,7 +340,7 @@ describe Page, "before save filter" do end describe Page, "rendering" do - scenario :pages, :markup_pages, :snippets, :layouts + dataset :pages, :markup_pages, :snippets, :layouts test_helper :render before :each do @@ -391,7 +391,7 @@ describe Page, "rendering" do end describe Page, "#find_by_url" do - scenario :pages, :file_not_found + dataset :pages, :file_not_found before :each do @page = pages(:home) @@ -518,7 +518,7 @@ describe Page, 'loading subclasses after bootstrap' do end describe Page, "class which is applied to a page but not defined" do - scenario :pages + dataset :pages before :each do eval(%Q{class ClassNotDefinedPage < Page; def self.missing?; false end end}, TOPLEVEL_BINDING) @@ -541,7 +541,7 @@ describe Page, "class which is applied to a page but not defined" do end describe Page, "class find_by_url" do - scenario :pages, :file_not_found + dataset :pages, :file_not_found it 'should find the home page' do Page.find_by_url('/').should == pages(:home) @@ -564,7 +564,7 @@ describe Page, "class find_by_url" do end describe Page, "processing" do - scenario :pages_with_layouts + dataset :pages_with_layouts before :all do @request = ActionController::TestRequest.new :url => '/page/' spec/models/page_spec.rb @@ -1,7 +1,7 @@ require File.dirname(__FILE__) + "/../../spec_helper" describe Radiant::Exporter do - scenario :pages_with_layouts, :users_and_pages, :snippets + dataset :pages_with_layouts, :users_and_pages, :snippets before :each do @exporter = Radiant::Exporter spec/models/radiant/exporter_spec.rb @@ -1,7 +1,7 @@ require File.dirname(__FILE__) + '/../spec_helper' describe Snippet do - scenario :snippets + dataset :snippets test_helper :validations before :each do spec/models/snippet_spec.rb @@ -1,7 +1,7 @@ require File.dirname(__FILE__) + '/../spec_helper' describe "Standard Tags" do - scenario :users_and_pages, :file_not_found, :snippets + dataset :users_and_pages, :file_not_found, :snippets it '<r:page> should allow access to the current page' do page(:home) spec/models/standard_tags_spec.rb @@ -1,7 +1,7 @@ require File.dirname(__FILE__) + '/../spec_helper' describe UserActionObserver do - scenario :users, :pages_with_layouts, :snippets + dataset :users, :pages_with_layouts, :snippets before(:each) do @user = users(:existing) spec/models/user_action_observer_spec.rb @@ -1,7 +1,7 @@ require File.dirname(__FILE__) + '/../spec_helper' describe User, "validations" do - scenario :users + dataset :users test_helper :validations before :each do @@ -77,7 +77,7 @@ describe User, "validations" do end describe User do - scenario :users + dataset :users before :each do @user = User.new(user_params) @@ -152,7 +152,7 @@ describe User do end describe User, "class methods" do - scenario :users + dataset :users it 'should authenticate with correct username and password' do expected = users(:existing) spec/models/user_spec.rb @@ -12,7 +12,7 @@ unless defined? SPEC_ROOT end require 'spec' require 'spec/rails' - require 'scenarios' + require 'dataset' require 'spec/integration' module Kernel @@ -22,6 +22,9 @@ unless defined? SPEC_ROOT end class Test::Unit::TestCase + include Dataset + datasets_directory "#{RADIANT_ROOT}/spec/datasets" + class << self # Class method for test helpers def test_helper(*names) @@ -49,8 +52,6 @@ unless defined? SPEC_ROOT require matcher end - Scenario.load_paths.unshift "#{RADIANT_ROOT}/spec/scenarios" - module Spec module Application module IntegrationExampleExtensions spec/spec_helper.rb @@ -1,7 +1,7 @@ require File.dirname(__FILE__) + '/../spec_helper' describe ArchiveDayIndexPage do - scenario :archive + dataset :archive before :each do @page = pages(:day_index) vendor/extensions/archive/spec/models/archive_day_index_page_spec.rb @@ -1,7 +1,7 @@ require File.dirname(__FILE__) + '/../spec_helper' describe ArchiveMonthIndexPage do - scenario :archive + dataset :archive before :each do @page = pages(:month_index) vendor/extensions/archive/spec/models/archive_month_index_page_spec.rb @@ -1,7 +1,7 @@ require File.dirname(__FILE__) + '/../spec_helper' describe ArchivePage do - scenario :archive + dataset :archive before :each do @page = pages(:archive) vendor/extensions/archive/spec/models/archive_page_spec.rb @@ -1,7 +1,7 @@ require File.dirname(__FILE__) + '/../spec_helper' describe ArchiveYearIndexPage do - scenario :archive + dataset :archive before :each do @page = pages(:year_index) vendor/extensions/archive/spec/models/archive_year_index_page_spec.rb @@ -15,7 +15,7 @@ describe MarkdownFilter do end describe "<r:markdown>" do - scenario :pages + dataset :pages it "should filter its contents with Markdown" do pages(:home).should render("<r:markdown>* item </r:markdown>").as("<ul>\n<li>item </li>\n</ul>") end vendor/extensions/markdown_filter/spec/models/markdown_filter_spec.rb @@ -12,7 +12,7 @@ describe SmartyPantsFilter do end describe "<r:smarty_pants>" do - scenario :pages + dataset :pages it "should filter its contents with SmartyPants" do pages(:home).should render('<r:smarty_pants>"A revolutionary quotation."</r:smarty_pants>').as("&#8220;A revolutionary quotation.&#8221;") end vendor/extensions/markdown_filter/spec/models/smarty_pants_filter_spec.rb @@ -11,7 +11,7 @@ describe TextileFilter do end describe "<r:textile>" do - scenario :pages + dataset :pages it "should filter its contents with Textile" do pages(:home).should render("<r:textile>h1. Test</r:textile>").as("<h1>Test</h1>") vendor/extensions/textile_filter/spec/models/textile_filter_spec.rb spec/scenarios/file_not_found_scenario.rb spec/scenarios/home_page_scenario.rb spec/scenarios/layouts_scenario.rb spec/scenarios/markup_pages_scenario.rb spec/scenarios/pages_scenario.rb spec/scenarios/pages_with_layouts_scenario.rb spec/scenarios/snippets_scenario.rb spec/scenarios/users_and_pages_scenario.rb spec/scenarios/users_scenario.rb vendor/plugins/scenarios/LICENSE vendor/plugins/scenarios/README vendor/plugins/scenarios/Rakefile vendor/plugins/scenarios/TODO vendor/plugins/scenarios/lib/scenarios.rb vendor/plugins/scenarios/lib/scenarios/base.rb vendor/plugins/scenarios/lib/scenarios/builtin/blank_scenario.rb vendor/plugins/scenarios/lib/scenarios/configuration.rb vendor/plugins/scenarios/lib/scenarios/extensions.rb vendor/plugins/scenarios/lib/scenarios/extensions/active_record.rb vendor/plugins/scenarios/lib/scenarios/extensions/delegating_attributes.rb vendor/plugins/scenarios/lib/scenarios/extensions/object.rb vendor/plugins/scenarios/lib/scenarios/extensions/string.rb vendor/plugins/scenarios/lib/scenarios/extensions/symbol.rb vendor/plugins/scenarios/lib/scenarios/extensions/test_case.rb vendor/plugins/scenarios/lib/scenarios/loading.rb vendor/plugins/scenarios/lib/scenarios/table_blasting.rb vendor/plugins/scenarios/lib/scenarios/table_methods.rb vendor/plugins/scenarios/spec/scenarios/complex_composite_scenario.rb vendor/plugins/scenarios/spec/scenarios/composite_scenario.rb vendor/plugins/scenarios/spec/scenarios/empty_scenario.rb vendor/plugins/scenarios/spec/scenarios/people_scenario.rb vendor/plugins/scenarios/spec/scenarios/places_scenario.rb vendor/plugins/scenarios/spec/scenarios/things_scenario.rb vendor/plugins/scenarios/spec/scenarios_spec.rb vendor/plugins/scenarios/spec/spec.opts vendor/plugins/scenarios/spec/spec_helper.rb vendor/plugins/scenarios/tasks/scenario.rake vendor/plugins/scenarios/test/scenarios_test.rb vendor/plugins/scenarios/test/test_helper.rb vendor/plugins/scenarios/testing/application.rb vendor/plugins/scenarios/testing/database.yml vendor/plugins/scenarios/testing/environment.rb vendor/plugins/scenarios/testing/library.rb vendor/plugins/scenarios/testing/models.rb vendor/plugins/scenarios/testing/rspec_on_rails_3014.patch vendor/plugins/scenarios/testing/rspec_on_rails_3119.patch vendor/plugins/scenarios/testing/schema.rb be5d0cd15971632e0e70488cac7b04f72780e1e6 Nathaniel Talbott nathaniel@terralien.com http://github.com/radiant/radiant/commit/1b9442dc4c39f391580ee68fa175476a53d5de50 1b9442dc4c39f391580ee68fa175476a53d5de50 2008-12-13T08:12:55-08:00 2008-12-13T08:12:55-08:00 Moved to dataset. 1a37e7a6d5836d9f13932eec247d933deb345848 Nathaniel Talbott nathaniel@terralien.com