rakedotnet 1.1.53 → 1.1.54

data/lib/nunit.rb

@@ -4,6 +4,7 @@ require 'dotframeworksymbolhelp'
 module BradyW
   class Nunit < BaseTask
     include Dotframeworksymbolhelp
+    PROGRAM_FILES_DIR = "C:/Program Files (x86)"
 
     # *Required* Files/assemblies to test
     attr_accessor :files
@@ -14,7 +15,7 @@ module BradyW
     # *Optional* What version of the .NET framework to use for the tests?  :v2_0, :v3_5, :v4_0, :v4_5, defaults to :v4_5
     attr_accessor :framework_version
 
-    # *Optional* Location of nunit-console.exe, defaults to C:\Program Files (x86)\NUnit ${version}\bin
+    # *Optional* Full path of nunit-console.exe, defaults to C:\Program Files (x86)\NUnit ${version}\bin\nunit-console.exe
     attr_accessor :path
 
     # *Optional* Timeout for each test case in milliseconds, by default the timeout is 35 seconds
@@ -42,7 +43,7 @@ module BradyW
 
     def exectask
       assemblies = files.uniq.join(" ")
-      shell "\"#{path}\\#{executable}\"#{output}#{errors}#{labels_flat}#{xml_output_flat}/framework=#{framework_version} /timeout=#{timeout}#{testsparam}#{assemblies}"
+      shell "\"#{full_path}\"#{output}#{errors}#{labels_flat}#{xml_output_flat}/framework=#{framework_version} /timeout=#{timeout}#{testsparam}#{assemblies}"
     end
 
     def executable
@@ -91,8 +92,12 @@ module BradyW
       convertToNumber(@framework_version || :v4_5)
     end
 
-    def path
-      @path || "C:\\Program Files (x86)\\NUnit #{version}\\bin"
+    def full_path
+      possibleDirectories = ["NUnit #{version}","NUnit-#{version}"]
+      candidates = @path ? [@path] : possibleDirectories.map {|p| File.join(PROGRAM_FILES_DIR,p,"bin",executable) }
+      found = candidates.detect {|c| File.exists? c}
+      return found if found
+      raise "We checked the following locations and could not find nunit-console.exe #{candidates}"
     end
 
     def timeout

data/spec/nunit_spec.rb

@@ -3,13 +3,36 @@ require "nunit"
 require "basetaskmocking"
 
 describe BradyW::Nunit do
+  before(:each) do
+    File.stub(:exists?).with("C:/Program Files (x86)/NUnit 2.6.3/bin/nunit-console.exe").and_return(true)
+  end
+
+  it 'throws error when NUnit could not be found' do
+    File.stub(:exists?).with("C:/Program Files (x86)/NUnit 2.6.3/bin/nunit-console.exe").and_return(false)
+    File.stub(:exists?).with("C:/Program Files (x86)/NUnit-2.6.3/bin/nunit-console.exe").and_return(false)
+
+    task = BradyW::Nunit.new do |test|
+              test.files = ["file1.dll", "file2.dll"]
+    end
+    lambda {task.exectaskpublic}.should raise_exception("We checked the following locations and could not find nunit-console.exe [\"C:/Program Files (x86)/NUnit 2.6.3/bin/nunit-console.exe\", \"C:/Program Files (x86)/NUnit-2.6.3/bin/nunit-console.exe\"]")
+  end
+
+  it 'works when a ZIP file, not an MSI is installed, which has a different path' do
+    File.stub(:exists?).with("C:/Program Files (x86)/NUnit 2.6.3/bin/nunit-console.exe").and_return(false)
+    File.stub(:exists?).with("C:/Program Files (x86)/NUnit-2.6.3/bin/nunit-console.exe").and_return(true)
+    task = BradyW::Nunit.new do |test|
+          test.files = ["file1.dll", "file2.dll"]
+    end
+    task.exectaskpublic
+    task.excecutedPop.should == "\"C:/Program Files (x86)/NUnit-2.6.3/bin/nunit-console.exe\" /labels /noxml /framework=4.5 /timeout=35000 file1.dll file2.dll"
+  end
 
   it 'shows correct default command line' do
     task = BradyW::Nunit.new do |test|
       test.files = ["file1.dll", "file2.dll"]
     end
     task.exectaskpublic
-    task.excecutedPop.should == "\"C:\\Program Files (x86)\\NUnit 2.6.3\\bin\\nunit-console.exe\" /labels /noxml /framework=4.5 /timeout=35000 file1.dll file2.dll"
+    task.excecutedPop.should == "\"C:/Program Files (x86)/NUnit 2.6.3/bin/nunit-console.exe\" /labels /noxml /framework=4.5 /timeout=35000 file1.dll file2.dll"
   end
 
   it 'doesnt test duplicate files' do
@@ -17,34 +40,46 @@ describe BradyW::Nunit do
       test.files = ["file1.dll", "file1.dll"]
     end
     task.exectaskpublic
-    task.excecutedPop.should == "\"C:\\Program Files (x86)\\NUnit 2.6.3\\bin\\nunit-console.exe\" /labels /noxml /framework=4.5 /timeout=35000 file1.dll"
+    task.excecutedPop.should == "\"C:/Program Files (x86)/NUnit 2.6.3/bin/nunit-console.exe\" /labels /noxml /framework=4.5 /timeout=35000 file1.dll"
   end
 
   it 'uses NUnit 2.6.1' do
+    File.stub(:exists?).with("C:/Program Files (x86)/NUnit 2.6.1/bin/nunit-console.exe").and_return(true)
     task = BradyW::Nunit.new do |test|
       test.files = ["file1.dll", "file2.dll"]
       test.version = "2.6.1"
     end
     task.exectaskpublic
-    task.excecutedPop.should == "\"C:\\Program Files (x86)\\NUnit 2.6.1\\bin\\nunit-console.exe\" /labels /noxml /framework=4.5 /timeout=35000 file1.dll file2.dll"
+    task.excecutedPop.should == "\"C:/Program Files (x86)/NUnit 2.6.1/bin/nunit-console.exe\" /labels /noxml /framework=4.5 /timeout=35000 file1.dll file2.dll"
   end
 
   it 'uses a configured custom path' do
+    File.stub(:exists?).with("C:\\SomeOtherplace\\nunit-console.exe").and_return(true)
     task = BradyW::Nunit.new do |test|
       test.files = ["file1.dll", "file2.dll"]
-      test.path = "C:\\SomeOtherplace"
+      test.path = "C:\\SomeOtherplace\\nunit-console.exe"
     end
     task.exectaskpublic
     task.excecutedPop.should == "\"C:\\SomeOtherplace\\nunit-console.exe\" /labels /noxml /framework=4.5 /timeout=35000 file1.dll file2.dll"
   end
 
+  it 'uses a configured custom path and the console is not found' do
+    File.stub(:exists?).with("C:/SomeOtherplace/nunit-console.exe").and_return(false)
+      task = BradyW::Nunit.new do |test|
+        test.files = ["file1.dll", "file2.dll"]
+        test.path = "C:/SomeOtherplace/nunit-console.exe"
+      end
+
+      lambda {task.exectaskpublic}.should raise_exception "We checked the following locations and could not find nunit-console.exe [\"C:/SomeOtherplace/nunit-console.exe\"]"
+    end
+
   it 'uses a custom timeout' do
     task = BradyW::Nunit.new do |test|
       test.files = ["file1.dll", "file2.dll"]
       test.timeout = 25
     end
     task.exectaskpublic
-    task.excecutedPop.should == "\"C:\\Program Files (x86)\\NUnit 2.6.3\\bin\\nunit-console.exe\" /labels /noxml /framework=4.5 /timeout=25 file1.dll file2.dll"
+    task.excecutedPop.should == "\"C:/Program Files (x86)/NUnit 2.6.3/bin/nunit-console.exe\" /labels /noxml /framework=4.5 /timeout=25 file1.dll file2.dll"
   end
 
   it 'uses .NET 3.5' do
@@ -53,7 +88,7 @@ describe BradyW::Nunit do
       test.framework_version = :v3_5
     end
     task.exectaskpublic
-    task.excecutedPop.should == "\"C:\\Program Files (x86)\\NUnit 2.6.3\\bin\\nunit-console.exe\" /labels /noxml /framework=3.5 /timeout=35000 file1.dll file2.dll"
+    task.excecutedPop.should == "\"C:/Program Files (x86)/NUnit 2.6.3/bin/nunit-console.exe\" /labels /noxml /framework=3.5 /timeout=35000 file1.dll file2.dll"
   end
 
   it 'can handle a single specific test to run' do
@@ -63,7 +98,7 @@ describe BradyW::Nunit do
     end
 
     task.exectaskpublic
-    task.excecutedPop.should == "\"C:\\Program Files (x86)\\NUnit 2.6.3\\bin\\nunit-console.exe\" /labels /noxml /framework=4.5 /timeout=35000 /run=some.test file1.dll file2.dll"
+    task.excecutedPop.should == "\"C:/Program Files (x86)/NUnit 2.6.3/bin/nunit-console.exe\" /labels /noxml /framework=4.5 /timeout=35000 /run=some.test file1.dll file2.dll"
   end
 
   it 'can handle a multiple specific tests to run' do
@@ -73,7 +108,7 @@ describe BradyW::Nunit do
     end
 
     task.exectaskpublic
-    task.excecutedPop.should == "\"C:\\Program Files (x86)\\NUnit 2.6.3\\bin\\nunit-console.exe\" /labels /noxml /framework=4.5 /timeout=35000 /run=some.test,some.other.test file1.dll file2.dll"
+    task.excecutedPop.should == "\"C:/Program Files (x86)/NUnit 2.6.3/bin/nunit-console.exe\" /labels /noxml /framework=4.5 /timeout=35000 /run=some.test,some.other.test file1.dll file2.dll"
   end
 
   it 'should work OK if XML output is turned on' do
@@ -82,7 +117,7 @@ describe BradyW::Nunit do
       test.xml_output = :enabled
     end
     task.exectaskpublic
-    task.excecutedPop.should == "\"C:\\Program Files (x86)\\NUnit 2.6.3\\bin\\nunit-console.exe\" /labels /framework=4.5 /timeout=35000 file1.dll file2.dll"
+    task.excecutedPop.should == "\"C:/Program Files (x86)/NUnit 2.6.3/bin/nunit-console.exe\" /labels /framework=4.5 /timeout=35000 file1.dll file2.dll"
 
   end
 
@@ -92,7 +127,7 @@ describe BradyW::Nunit do
       test.labels = :exclude_labels
     end
     task.exectaskpublic
-    task.excecutedPop.should == "\"C:\\Program Files (x86)\\NUnit 2.6.3\\bin\\nunit-console.exe\" /noxml /framework=4.5 /timeout=35000 file1.dll file2.dll"
+    task.excecutedPop.should == "\"C:/Program Files (x86)/NUnit 2.6.3/bin/nunit-console.exe\" /noxml /framework=4.5 /timeout=35000 file1.dll file2.dll"
 
   end
 
@@ -103,16 +138,17 @@ describe BradyW::Nunit do
       test.errors = "someerrorfile.txt"
     end
     task.exectaskpublic
-    task.excecutedPop.should == "\"C:\\Program Files (x86)\\NUnit 2.6.3\\bin\\nunit-console.exe\" /output=somefile.txt /err=someerrorfile.txt /labels /noxml /framework=4.5 /timeout=35000 file1.dll file2.dll"
+    task.excecutedPop.should == "\"C:/Program Files (x86)/NUnit 2.6.3/bin/nunit-console.exe\" /output=somefile.txt /err=someerrorfile.txt /labels /noxml /framework=4.5 /timeout=35000 file1.dll file2.dll"
   end
 
   it 'Should work OK with x86 arch' do
+    File.stub(:exists?).with("C:/Program Files (x86)/NUnit 2.6.3/bin/nunit-console-x86.exe").and_return(true)
     task = BradyW::Nunit.new do |test|
       test.files = ["file1.dll", "file2.dll"]
       test.arch = :x86
     end
     task.exectaskpublic
-    task.excecutedPop.should == "\"C:\\Program Files (x86)\\NUnit 2.6.3\\bin\\nunit-console-x86.exe\" /labels /noxml /framework=4.5 /timeout=35000 file1.dll file2.dll"
+    task.excecutedPop.should == "\"C:/Program Files (x86)/NUnit 2.6.3/bin/nunit-console-x86.exe\" /labels /noxml /framework=4.5 /timeout=35000 file1.dll file2.dll"
 
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rakedotnet
 version: !ruby/object:Gem::Version
-  version: 1.1.53
+  version: 1.1.54
   prerelease: 
 platform: ruby
 authors:
@@ -89,7 +89,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 78227580219478976
+      hash: -1866239646096198207
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: