upgrade to 0.7.1 datasets

saturnflyer · Mar 10, 2009 · 660a22d · 660a22d
1 parent 27e2fd1
commit 660a22d
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 9 deletions.
diff --git a/spec/controllers/page_requests_controller_spec.rb b/spec/controllers/page_requests_controller_spec.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

diff --git a/spec/controllers/site_controller_spec.rb b/spec/controllers/site_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

diff --git a/spec/scenarios/page_requests_scenario.rb → spec/datasets/page_requests_dataset.rb b/spec/scenarios/page_requests_scenario.rb → spec/datasets/page_requests_dataset.rb
@@ -1,4 +1,4 @@
-class PageRequestsScenario < Scenario::Base
+class PageRequestsDataset < Dataset::Base
   class VirtualPage < Page
     def virtual?
       true

diff --git a/spec/models/page_request_spec.rb b/spec/models/page_request_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')

diff --git a/spec/models/page_spec.rb b/spec/models/page_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)

diff --git a/spec/models/popular_page_tags_spec.rb b/spec/models/popular_page_tags_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)

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -11,9 +11,8 @@
 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