Changeset 875

Show
Ignore:
Timestamp:
11/06/07 15:49:26 (1 year ago)
Author:
iv..@gweezlebur.com
Message:

Use merb_activerecord instead of merb_active_record, same for DM

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/app_generators/merb/templates/config/dependencies.rb

    r855 r875  
    1111 
    1212### Uncomment for DataMapper ORM 
    13 # use_orm :data_mapper 
     13# use_orm :datamapper 
    1414 
    1515### Uncomment for ActiveRecord ORM 
    16 # use_orm :active_record 
     16# use_orm :activerecord 
    1717 
    1818### Uncomment for Sequel ORM 

  • trunk/spec/merb/plugins_spec.rb

    r856 r875  
    2222   
    2323  it "should raise an error if use_orm is called twice" do 
    24     use_orm(:active_record) 
    25     lambda { use_orm(:data_mapper) }.should raise_error 
     24    use_orm(:activerecord) 
     25    lambda { use_orm(:datamapper) }.should raise_error 
    2626  end 
    2727 
    28   it "should not have :merb_default in GENERATOR_SCOPE with use_orm(:active_record)" do 
    29     use_orm(:active_record) 
     28  it "should not have :merb_default in GENERATOR_SCOPE with use_orm(:activerecord)" do 
     29    use_orm(:activerecord) 
    3030    Merb::GENERATOR_SCOPE.should_not include(:merb_default) 
    3131  end 
    3232 
    33   it "should have :active_record in GENERATOR_SCOPE with use_orm(:active_record)" do 
    34     use_orm(:active_record) 
    35     Merb::GENERATOR_SCOPE.should include(:active_record) 
     33  it "should have :activerecord in GENERATOR_SCOPE with use_orm(:activerecord)" do 
     34    use_orm(:activerecord) 
     35    Merb::GENERATOR_SCOPE.should include(:activerecord) 
    3636  end 
    3737 
    38   it "should have :active_record first in GENERATOR_SCOPE with use_orm(:active_record)" do 
    39     use_orm(:active_record) 
    40     Merb::GENERATOR_SCOPE.first.should == :active_record 
     38  it "should have :activerecord first in GENERATOR_SCOPE with use_orm(:activerecord)" do 
     39    use_orm(:activerecord) 
     40    Merb::GENERATOR_SCOPE.first.should == :activerecord 
    4141  end 
    4242   
    43   it "should call dependency :merb_active_record with use_orm(:active_record)" do 
    44     Kernel.should_receive(:dependency).with("merb_active_record").once. 
     43  it "should call dependency :merb_activerecord with use_orm(:activerecord)" do 
     44    Kernel.should_receive(:dependency).with("merb_activerecord").once. 
    4545      and_return(true) 
    46     use_orm(:active_record) 
     46    use_orm(:activerecord) 
    4747  end 
    4848