From 40569149f8e239d0cc0fb831548f0ff0a286e285 Mon Sep 17 00:00:00 2001
From: pivotal <pivotal@Bartlett.flood.pivotallabs.com>
Date: Thu, 28 Jan 2010 14:03:30 -0800
Subject: [PATCH] Bad filepath in simple_config_file caused breakage. Sorry

---
 .../spec/javascripts/support/jasmine_config.rb        |  6 ++++--
 jasmine.gemspec                                       |  2 +-
 lib/jasmine/config.rb                                 |  4 ++--
 spec/config_spec.rb                                   | 11 ++++++++---
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/generators/jasmine/templates/spec/javascripts/support/jasmine_config.rb b/generators/jasmine/templates/spec/javascripts/support/jasmine_config.rb
index efbb1744..2f531e13 100644
--- a/generators/jasmine/templates/spec/javascripts/support/jasmine_config.rb
+++ b/generators/jasmine/templates/spec/javascripts/support/jasmine_config.rb
@@ -2,13 +2,15 @@ require 'jasmine'
 
 class Jasmine::Config
 
+# Override these methods if necessary
+
 #  def project_root
 #    Dir.pwd
 #  end
 
-#  Path to your jasmine.yaml
+#  Path to your jasmine.yml
 #  def simple_config_file
-#    File.join(project_root, 'spec/javascripts/support/jasmine.yaml')
+#    File.join(project_root, 'spec/javascripts/support/jasmine.yml')
 #  end
 
 #  Source directory path. Your src_files must be returned relative to this path.
diff --git a/jasmine.gemspec b/jasmine.gemspec
index bcf77188..148a1fa8 100644
--- a/jasmine.gemspec
+++ b/jasmine.gemspec
@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rajan Agaskar", "Christian Williams"]
-  s.date = %q{2010-01-27}
+  s.date = %q{2010-01-28}
   s.default_executable = %q{jasmine}
   s.description = %q{Javascript BDD test framework}
   s.email = %q{ragaskar@gmail.com}
diff --git a/lib/jasmine/config.rb b/lib/jasmine/config.rb
index 16705fc4..87db4e5a 100644
--- a/lib/jasmine/config.rb
+++ b/lib/jasmine/config.rb
@@ -116,7 +116,7 @@ module Jasmine
     end
 
     def simple_config_file
-      File.join(project_root, 'spec/javascripts/support/jasmine.yaml')
+      File.join(project_root, 'spec/javascripts/support/jasmine.yml')
     end
 
     def src_dir
@@ -160,4 +160,4 @@ module Jasmine
     end
 
   end
-end
\ No newline at end of file
+end
diff --git a/spec/config_spec.rb b/spec/config_spec.rb
index 133f050a..400644b3 100644
--- a/spec/config_spec.rb
+++ b/spec/config_spec.rb
@@ -24,7 +24,7 @@ describe Jasmine::Config do
     end
 
     it "if jasmine.yml is empty" do
-      @config.stub!(:simple_config_file).and_return(File.join(@template_dir, 'spec/javascripts/support/jasmine.yaml'))
+      @config.stub!(:simple_config_file).and_return(File.join(@template_dir, 'spec/javascripts/support/jasmine.yml'))
       YAML.stub!(:load).and_return(false)
       @config.src_files.should == []
       @config.stylesheets.should == []
@@ -54,7 +54,7 @@ describe Jasmine::Config do
       @config.stylesheets.should == ['foo.css', 'bar.css']
     end
 
-    it "using rails jasmine.yaml" do
+    it "using rails jasmine.yml" do
       original_glob = Dir.method(:glob)
       Dir.stub!(:glob).and_return do |glob_string|
         if glob_string =~ /public/
@@ -97,6 +97,11 @@ describe Jasmine::Config do
     @config.src_dir.should == 'some_project_root'
   end
 
+  it "should use correct default yaml config" do
+    @config.stub!(:project_root).and_return('some_project_root')
+    @config.simple_config_file.should == (File.join('some_project_root', 'spec/javascripts/support/jasmine.yml'))
+  end
+
 
   it "should provide dir mappings" do
     @config.mappings.should == {
@@ -105,4 +110,4 @@ describe Jasmine::Config do
     }
   end
 
-end
\ No newline at end of file
+end