spec/configuration_spec.rb in ninjs-0.14.1 vs spec/configuration_spec.rb in ninjs-0.16.0

@@ -1,70 +1,56 @@
 require "spec_helper"
 
 describe Ninjs::Configuration do
   context 'Instantiation' do
     before :each do
-      suppress_output { @config = Ninjs::Configuration.new File.expand_path(Dir.getwd) }
+      suppress_output { @config = Ninjs::Configuration.new SPEC_DIR }
     end
 
     it 'should exist' do
       Ninjs::Configuration.should_not be_nil
     end
 
     it 'should have a root variable' do
-      @config.root.should == File.expand_path(Dir.getwd)
+      @config.root.should == SPEC_DIR
     end
 
-    it 'should have a setting setter method' do
-      @config.setting(:name, 'someapp')
-      @config.name.should == 'someapp'
-    end
-
-    it 'should have a settings hash' do
-      @config.settings.has_key?(:name).should be_true
-      @config.settings[:name].should == 'application'
-
-      @config.settings.has_key?(:src_dir).should be_true
-      @config.settings[:src_dir].should == 'modules'
-
-      @config.settings.has_key?(:dest_dir).should be_true
-      @config.settings[:dest_dir].should == 'application'
-
-      @config.settings.has_key?(:output).should be_true
-      @config.settings[:output].should == 'expanded'
-
-      @config.settings.has_key?(:dependencies).should be_true
-      @config.settings[:dependencies].should == ['<jquery/latest>']
-
-      @config.settings.has_key?(:autoload).should be_true
-      @config.settings[:autoload].should == ['../lib/utilities']
-    end
-    
     it 'should have the correct default instance variables' do
-      @config.root.should == File.expand_path(Dir.getwd)
+      @config.root.should == SPEC_DIR
       @config.name.should == 'application'
       @config.output.should == "expanded"
-      @config.asset_root.should == @config.root
+      @config.asset_root.should == File.expand_path('../', SPEC_DIR)
       @config.dependencies.should == ["<jquery/latest>"]
       @config.autoload.should == ["../lib/utilities"]
       @config.src_dir.should == "modules"
       @config.dest_dir.should == "application"
+      @config.module_alias.should == "mod"
     end
-  end
-  
+  end # Instantiation
+
   context "New config" do
     before :each do
       suppress_output do
-        @config = Ninjs::Configuration.new File.expand_path(Dir.getwd)
+        @config = Ninjs::Configuration.new SPEC_DIR
         @config.write
       end
     end
-    
+
     after :each do
-      File.delete 'ninjs.conf'
+      File.delete "#{SPEC_DIR}/ninjs.conf"
     end
-    
+
     it 'should create a configuration file from defaults' do
-      'ninjs.conf'.should be_same_file_as 'fixtures/new.ninjs.conf'
+      "#{SPEC_DIR}/ninjs.conf".should be_same_file_as "#{SPEC_DIR}/fixtures/new.ninjs.conf"
     end
-  end
+    
+    it 'should read properties to config' do
+      File.open("#{SPEC_DIR}/ninjs.conf", "w+") do |file|
+        file << File.open("#{SPEC_DIR}/fixtures/updated.ninjs.conf").readlines.join("")
+      end
+      
+      @config.read
+      @config.asset_root.should == File.expand_path(SPEC_DIR)
+    end
+  end # New config
+
 end
\ No newline at end of file