spec/datasets/page_requests_dataset.rb @@ -1,7 +1,7 @@ require File.dirname(__FILE__) + '/../spec_helper' describe Admin::PageRequestsController do - scenario :users, :page_requests + dataset :users, :page_requests describe "when receiving a DELETE request to /admin/page_request/:id" do before(:each) do spec/controllers/page_requests_controller_spec.rb @@ -1,7 +1,7 @@ require File.dirname(__FILE__) + '/../spec_helper' describe SiteController, "with page track" do - scenario :page_requests, :pages + dataset :page_requests, :pages before(:each) do create_page "Oops.", :class_name => 'FileNotFoundPage', :status_id => Status[:published].id spec/controllers/site_controller_spec.rb @@ -1,7 +1,7 @@ require File.dirname(__FILE__) + '/../spec_helper' describe PageRequest do - scenario :page_requests + dataset :page_requests before(:each) do @page_request = PageRequest.create!(:url => 'this/and/that') spec/models/page_request_spec.rb @@ -1,7 +1,7 @@ require File.dirname(__FILE__) + '/../spec_helper' describe Page do - scenario :users, :pages, :page_requests + dataset :users, :pages, :page_requests it "should update the page_request virtual field when the page with the same url is created" do PageRequest.create(:url => 'created_before_page', :virtual => true) spec/models/page_spec.rb @@ -1,7 +1,7 @@ require File.dirname(__FILE__) + '/../spec_helper' describe "PopularPageTags" do - scenario :pages, :page_requests + dataset :pages, :page_requests before(:each) do @page_request = mock_model(PageRequest) spec/models/popular_page_tags_spec.rb @@ -11,9 +11,8 @@ unless defined? RADIANT_ROOT end require "#{RADIANT_ROOT}/spec/spec_helper" -if File.directory?(File.dirname(__FILE__) + "/scenarios") - Scenario.load_paths.unshift File.dirname(__FILE__) + "/scenarios" -end +Dataset::Resolver.default << (File.dirname(__FILE__) + "/datasets") + if File.directory?(File.dirname(__FILE__) + "/matchers") Dir[File.dirname(__FILE__) + "/matchers/*.rb"].each {|file| require file } end spec/spec_helper.rb spec/scenarios/page_requests_scenario.rb 27e2fd1b80a3ea9c6c470cf88595267657015dfe Jim Gay saturnflyer jim@saturnflyer.com http://github.com/saturnflyer/radiant-site_watcher-extension/commit/660a22d66ee084602b59a4c4a5069ed1994383a3 660a22d66ee084602b59a4c4a5069ed1994383a3 2009-03-10T05:56:53-07:00 2009-03-10T05:56:53-07:00 upgrade to 0.7.1 datasets 411ba1d5f1a2439c91fcf6831990e5e577f90195 Jim Gay saturnflyer jim@saturnflyer.com