single_test 0.3.1 → 0.3.2

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/lib/single_test.rb

@@ -89,7 +89,10 @@ module SingleTest
   def run_test(type, file, test_name=nil)
     case type.to_s
     when 'test' then sh "ruby -Ilib:test #{file} -n /#{test_name}/"
-    when 'spec' then sh "export RAILS_ENV=test ; #{spec_executable} --options spec/spec.opts #{file}" + (test_name ? %Q( -e "#{test_name.sub('"',"\\\"")}") : '') + (ENV['X'] ? " -X" : "")
+    when 'spec' then
+      options_file = "spec/spec.opts"
+      options_file = (File.exist?(options_file) ? " --options #{options_file}" : "")
+      sh "export RAILS_ENV=test ; #{spec_executable}#{options_file} #{file}" + (test_name ? %Q( -e "#{test_name.sub('"',"\\\"")}") : '') + (ENV['X'] ? " -X" : "")
     else raise "Unknown: #{type}"
     end
   end
@@ -101,4 +104,4 @@ module SingleTest
   def last_modified_file(dir, options={})
     Dir["#{dir}/**/*#{options[:ext]}"].sort_by { |p| File.mtime(p) }.last
   end
-end
+end

data/single_test.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{single_test}
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]

data/spec/single_test_spec.rb

@@ -103,7 +103,7 @@ describe SingleTest do
     end
 
     it "runs the last test" do
-      SingleTest.should_receive(:run_test).with(:spec, "spec/yyy_spec.rb")
+      SingleTest.should_receive(:run_test).with(:spec, "spec/xxx_spec.rb")
       SingleTest.run_last(:spec)
     end
 
@@ -115,7 +115,11 @@ describe SingleTest do
   end
 
   describe :run_test do
-    after :all do
+    before do
+      ENV['X']=nil
+    end
+    
+    after do
       ENV['X']=nil
     end
 
@@ -134,25 +138,30 @@ describe SingleTest do
     end
 
     it "runs whole specs without -e" do
-      SingleTest.should_receive(:sh).with('export RAILS_ENV=test ; script/spec --options spec/spec.opts xxx')
+      SingleTest.should_receive(:sh).with('export RAILS_ENV=test ; script/spec xxx')
       SingleTest.run_test('spec','xxx')
     end
 
     it "runs single specs through -e" do
-      SingleTest.should_receive(:sh).with('export RAILS_ENV=test ; script/spec --options spec/spec.opts xxx -e "yyy"')
+      SingleTest.should_receive(:sh).with('export RAILS_ENV=test ; script/spec xxx -e "yyy"')
       SingleTest.run_test('spec','xxx', 'yyy')
     end
 
     it "runs single specs through -e with -X" do
       ENV['X']=''
-      SingleTest.should_receive(:sh).with('export RAILS_ENV=test ; script/spec --options spec/spec.opts xxx -e "yyy" -X')
+      SingleTest.should_receive(:sh).with('export RAILS_ENV=test ; script/spec xxx -e "yyy" -X')
       SingleTest.run_test('spec','xxx', 'yyy')
     end
 
     it "runs quoted specs though -e" do
-      SingleTest.should_receive(:sh).with(%Q(export RAILS_ENV=test ; script/spec --options spec/spec.opts xxx -e "y\\\"yy" -X))
+      SingleTest.should_receive(:sh).with(%Q(export RAILS_ENV=test ; script/spec xxx -e "y\\\"yy"))
       SingleTest.run_test('spec','xxx', 'y"yy')
+    end
 
+    it "adds --options if spec.opts file exists" do
+      File.stub!(:exist?).and_return true
+      SingleTest.should_receive(:sh).with('export RAILS_ENV=test ; script/spec --options spec/spec.opts xxx')
+      SingleTest.run_test('spec','xxx')
     end
   end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Michael Grosser