Changeset 1293

Show
Ignore:
Timestamp:
01/12/08 22:39:52 (9 months ago)
Author:
sethrasmuss..@gmail.com
Message:

require_fixtures helper; make some tests run standalone; anything using shared url behavior requires router spec models

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/spec/merb/dispatch_spec.rb

    r1228 r1293  
    11require File.dirname(__FILE__) + '/../spec_helper' 
    2 require File.dirname(__FILE__) + '/../fixtures/controllers/dispatch_spec_controllers' 
    3  
    4 $TESTING = true 
     2require_fixtures '/controllers/dispatch_spec_controllers' 
    53 
    64describe Merb::Dispatcher do 
    7  
    8   before(:all) do 
     5  before :all do 
    96    Merb::Config[:allow_reloading] = false 
    107    Merb::Router.prepare do |r| 
    …… 
    289286    controller.body.should == :edit 
    290287  end 
     288   
    291289  it "should handle request: GET /posts/1/edit and return Posts#edit" do 
    292290    controller, action = request(:get, '/posts/1/edit') 
    …… 
    336334    controller.body.should == :create 
    337335  end 
    338    
    339336   
    340337  it "should handle request: POST /posts.xml and return Posts#create format xml" do     
    …… 
    527524      controller, action = request(:get, '/bar/bam?a=1') 
    528525      controller.body.should == "1 nil" 
    529     end     
     526    end 
    530527  end 
    531528end 

  • trunk/spec/merb/multipart_spec.rb

    r1286 r1293  
    11require File.dirname(__FILE__) + '/../spec_helper' 
     2require 'tempfile' 
    23 
    34describe Merb::Test::Multipart::Param, '.to_multipart' do 
    …… 
    1617 
    1718describe Merb::Test::Multipart::Post, '.push_params(params) param parsing' do 
    18   before(:each) do 
     19  before :each do 
    1920    @fake_return_param = mock('fake return_param') 
    2021  end 
    21  
     22   
    2223  it "should create Param from params when param doesn't respond to read" do 
    2324    params = { 'normal' => 'normal_param' } 
    …… 
    4950end 
    5051 
    51 require 'tempfile' 
    52 require File.dirname(__FILE__) + '/../fixtures/controllers/render_spec_controllers' 
    53  
    5452describe Merb::Test::Helper, "Multipart form helpers" do 
    55    
    56   before(:each) do 
     53  before :each do 
    5754    @path = "/render_object_controller/render_object.xml" 
    5855    Merb::Router.prepare { |r| r.default_routes } 
    5956    @mp = Merb::Test::Multipart::Post  
    6057    @file = Tempfile.new("spec_file.stuff") 
    61   end   
     58  end 
    6259   
    6360  it "should setup a multipart request" do 
    …… 
    9592    multipart_request(@path, :foo => "bar") do 
    9693      controller.should_receive(:dispatch).and_return(true) 
    97     end     
     94    end 
    9895  end 
    9996   
    …… 
    109106    controller.request.should be_put 
    110107  end 
    111    
    112108end 

  • trunk/spec/merb/view_context_spec.rb

    r1291 r1293  
    11require File.dirname(__FILE__) + '/../spec_helper' 
    2 require FIXTURES + '/controllers/render_spec_controllers' 
     2require_fixtures '/controllers/render_spec_controllers' 
    33 
    44describe "View Context", "image tag" do 

  • trunk/spec/spec_helper.rb

    r1286 r1293  
    1515 
    1616FIXTURES = File.expand_path(File.join(File.dirname(__FILE__), 'fixtures')) unless defined?(FIXTURES) 
     17def require_fixtures(path) 
     18  require File.expand_path(File.join(FIXTURES, path)) 
     19end 
    1720 
    1821require File.join(File.dirname(__FILE__), "spec_helpers", "url_shared_behaviour") 

  • trunk/spec/spec_helpers/url_shared_behaviour.rb

    r1128 r1293  
     1require File.expand_path(File.dirname(__FILE__) + '/../fixtures/models/router_spec_models') 
     2 
    13describe "class with general url generation", :shared => true do 
    24