spec/controller/configurable_spec.rb in happy-0.1.0.pre25 vs spec/controller/configurable_spec.rb in happy-0.1.0.pre27

@@ -6,54 +6,54 @@
       set :foo, 'bar'
     end
 
     describe '.set' do
       it 'sets a class-level option' do
-        TestController.options[:foo].should == 'bar'
+        TestController.settings[:foo].should == 'bar'
       end
     end
 
     describe '#set' do
       before do
         @instance = TestController.new
         @instance.set :foo, 'baz'
       end
 
       it 'sets an instance-level option, overriding the class default' do
-        @instance.options[:foo].should == 'baz'
+        @instance.settings[:foo].should == 'baz'
       end
 
       it "doesn't modify the class-level default option" do
-        TestController.options[:foo].should == 'bar'
+        TestController.settings[:foo].should == 'bar'
       end
     end
 
-    describe 'class-level options' do
-      it 'are the defaults for instance-level options' do
-        TestController.new.options[:foo].should == 'bar'
+    describe 'class-level settings' do
+      it 'are the defaults for instance-level settings' do
+        TestController.new.settings[:foo].should == 'bar'
       end
     end
 
-    describe 'cascading options' do
+    describe 'cascading settings' do
       class OuterController < Controller
         set :views, './foo/'
         set :foo, 'bar'
       end
 
       class InnerController < Controller
       end
 
       it "are copied from the parent controller if necessary" do
         @instance = InnerController.new(OuterController.new)
-        @instance.options[:views].should == './foo/'
-        @instance.options[:foo].should be_nil
+        @instance.settings[:views].should == './foo/'
+        @instance.settings[:foo].should be_nil
       end
     end
 
-    describe 'options passed to the initializer' do
-      it "override default options" do
+    describe 'settings passed to the initializer' do
+      it "override default settings" do
         @instance = TestController.new({}, :foo => 'baz')
-        @instance.options[:foo].should == 'baz'
+        @instance.settings[:foo].should == 'baz'
       end
     end
   end
 end