You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@buildr.apache.org by to...@apache.org on 2010/04/12 01:57:35 UTC
svn commit: r933040 - in /buildr/trunk/spec: sandbox.rb scala/bdd_spec.rb
scala/compiler_spec.rb scala/tests_spec.rb
Author: toulmean
Date: Sun Apr 11 23:57:35 2010
New Revision: 933040
URL: http://svn.apache.org/viewvc?rev=933040&view=rev
Log:
Fix the specs: don't mess with the application build settings, reduce the scope of setting the scala version to the scala specs
Modified:
buildr/trunk/spec/sandbox.rb
buildr/trunk/spec/scala/bdd_spec.rb
buildr/trunk/spec/scala/compiler_spec.rb
buildr/trunk/spec/scala/tests_spec.rb
Modified: buildr/trunk/spec/sandbox.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/sandbox.rb?rev=933040&r1=933039&r2=933040&view=diff
==============================================================================
--- buildr/trunk/spec/sandbox.rb (original)
+++ buildr/trunk/spec/sandbox.rb Sun Apr 11 23:57:35 2010
@@ -114,9 +114,6 @@ module Sandbox
end
Buildr.options.proxy.http = nil
- # Force Scala 2.7.7 for specs; don't want to rely on SCALA_HOME
- Buildr.settings.build['scala.version'] = "2.7.7"
-
# Don't output crap to the console.
trace false
verbose false
Modified: buildr/trunk/spec/scala/bdd_spec.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/scala/bdd_spec.rb?rev=933040&r1=933039&r2=933040&view=diff
==============================================================================
--- buildr/trunk/spec/scala/bdd_spec.rb (original)
+++ buildr/trunk/spec/scala/bdd_spec.rb Sun Apr 11 23:57:35 2010
@@ -17,6 +17,12 @@
require File.join(File.dirname(__FILE__), '../spec_helpers')
describe Buildr::Scala::Specs do
+
+ before(:each) do
+ # Force Scala 2.7.7 for specs; don't want to rely on SCALA_HOME
+ Buildr.settings.build['scala.version'] = "2.7.7"
+ end
+
it 'should be the default when tests in src/spec/scala' do
write 'src/spec/scala/com/example/MySpecs.scala', <<-SCALA
package com.example
Modified: buildr/trunk/spec/scala/compiler_spec.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/scala/compiler_spec.rb?rev=933040&r1=933039&r2=933040&view=diff
==============================================================================
--- buildr/trunk/spec/scala/compiler_spec.rb (original)
+++ buildr/trunk/spec/scala/compiler_spec.rb Sun Apr 11 23:57:35 2010
@@ -18,6 +18,12 @@ require File.join(File.dirname(__FILE__)
# need to test both with and without SCALA_HOME
share_as :ScalacCompiler do
+
+ before(:each) do
+ # Force Scala 2.7.7 for specs; don't want to rely on SCALA_HOME
+ Buildr.settings.build['scala.version'] = "2.7.7"
+ end
+
it 'should identify itself from source directories' do
write 'src/main/scala/com/example/Test.scala', 'package com.example; class Test { val i = 1 }'
define('foo').compile.compiler.should eql(:scalac)
Modified: buildr/trunk/spec/scala/tests_spec.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/scala/tests_spec.rb?rev=933040&r1=933039&r2=933040&view=diff
==============================================================================
--- buildr/trunk/spec/scala/tests_spec.rb (original)
+++ buildr/trunk/spec/scala/tests_spec.rb Sun Apr 11 23:57:35 2010
@@ -25,6 +25,12 @@ require File.join(File.dirname(__FILE__)
describe Buildr::Scala::ScalaTest do
+
+ before(:each) do
+ # Force Scala 2.7.7 for specs; don't want to rely on SCALA_HOME
+ Buildr.settings.build['scala.version'] = "2.7.7"
+ end
+
it 'should be the default test framework when test cases are in Scala' do
write 'src/test/scala/com/example/MySuite.scala', <<-SCALA
package com.example