albacore 2.0.0.rc.10 → 2.0.0.rc.11

data/README.md

@@ -225,6 +225,7 @@ end
 test_runner :tests do |tests|
   tests.files = FileList['**/*.Tests/bin/Release/*.Tests.dll'] # dll files with test
   tests.exe = 'src/packages/NUnit.Runners.2.5.3/tools/nunit-console.exe' # executable to run tests with
+  tests.add_parameter '/TestResults=Lallaa.xml' # you may add parameters to the execution
   tests.copy_local # when running from network share
 end
 ```

data/lib/albacore/task_types/test_runner.rb

@@ -8,21 +8,6 @@ require 'albacore/cross_platform_cmd'
 
 module Albacore
   module TestRunner
-    class Cmd
-      include CrossPlatformCmd
-      def initialize work_dir, executable, parameters, file
-        @work_dir, @executable = work_dir, executable
-        @parameters = parameters.to_a.unshift(file)
-      end
-
-      def execute
-        system @executable,
-          @parameters,
-          :work_dir    => @work_dir,
-          :clr_command => true
-      end
-    end
-
     # the configuration object for the test runner
     class Config
       include CmdConfig
@@ -41,7 +26,8 @@ module Albacore
         Map.new(
           :files      => files,
           :copy_local => @copy_local,
-          :exe        => @exe)
+          :exe        => @exe,
+          :parameters => @parameters)
       end
 
       # mark that it should be possible to copy the test files local
@@ -61,6 +47,22 @@ module Albacore
       end
     end
 
+    class Cmd
+      include CrossPlatformCmd
+      def initialize work_dir, executable, parameters, file
+        @work_dir, @executable = work_dir, executable
+        @parameters = parameters.to_a.unshift(file)
+      end
+
+      def execute
+        system @executable,
+          @parameters,
+          :work_dir    => @work_dir,
+          :clr_command => true
+      end
+    end
+
+
     class Task
       include Logging
 

data/lib/albacore/version.rb

@@ -1,3 +1,3 @@
 module Albacore
-  VERSION = "2.0.0.rc.10"
+  VERSION = "2.0.0.rc.11"
 end

data/spec/test_runner_spec.rb

@@ -1,4 +1,5 @@
 require 'albacore/task_types/test_runner'
+require 'support/sh_interceptor'
 require 'map'
 
 describe ::Albacore::TestRunner::Config do
@@ -18,14 +19,60 @@ describe ::Albacore::TestRunner::Config do
     should respond_to :exe=
   end
 end
+describe ::Albacore::TestRunner::Config do
+  subject do
+    ::Albacore::TestRunner::Config.new
+  end
+
+  before :each do
+    subject.add_parameter '/TestResults=/b/c/d/e.xml'
+  end
+
+  it 'should have the appropriate parameter in #opts.get(:parameters)' do
+    subject.opts.get(:parameters).should include('/TestResults=/b/c/d/e.xml')
+  end
+end
+
+describe 'the order of which parameters are passed', ::Albacore::TestRunner::Config do
+  subject do
+    cmd = ::Albacore::TestRunner::Config.new
+    cmd.files = 'file.dll'
+    cmd.exe   = 'test-runner.exe'
+    cmd.add_parameter '/TestResults=abc.xml'
+    cmd
+  end
+
+  let :params do
+    subject.opts.get(:parameters)
+  end
+
+  it 'should first pass the flags' do
+    params.first.should eq('/TestResults=abc.xml')
+  end
+
+  it 'should pass the file as a :files' do
+    subject.opts.get(:files).should eq(['file.dll'])
+  end
+end
 
 describe ::Albacore::TestRunner::Cmd do
   subject do
-    ::Albacore::TestRunner::Cmd.new 'work_dir', 'run-tests.exe', %w[params go here], 'lib.tests.dll'
+    cmd = ::Albacore::TestRunner::Cmd.new 'work_dir', 'run-tests.exe', %w[params go here], 'lib.tests.dll'
+    cmd.extend ShInterceptor
+    cmd
   end
+
   it do
     should respond_to :execute
   end
+
+  it 'should include the parameters when executing' do
+    subject.execute
+
+    # the intersection of actual parameters with expected should eq expected
+    (subject.parameters - (subject.parameters - %w|params go here|)).
+      should eq(%w|params go here|)
+  end
 end
 
 describe ::Albacore::TestRunner::Task do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: albacore
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc.10
+  version: 2.0.0.rc.11
   prerelease: 6
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-02 00:00:00.000000000 Z
+date: 2014-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -317,7 +317,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 996579621817901824
+      hash: 2914469606549085872
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: