You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@buildr.apache.org by as...@apache.org on 2009/02/27 09:54:45 UTC

svn commit: r748438 - /buildr/trunk/spec/scala/tests_spec.rb

Author: assaf
Date: Fri Feb 27 08:54:45 2009
New Revision: 748438

URL: http://svn.apache.org/viewvc?rev=748438&view=rev
Log:
Move test around

Modified:
    buildr/trunk/spec/scala/tests_spec.rb

Modified: buildr/trunk/spec/scala/tests_spec.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/scala/tests_spec.rb?rev=748438&r1=748437&r2=748438&view=diff
==============================================================================
--- buildr/trunk/spec/scala/tests_spec.rb (original)
+++ buildr/trunk/spec/scala/tests_spec.rb Fri Feb 27 08:54:45 2009
@@ -244,6 +244,7 @@
     project('foo').test.failed_tests.should include('StringSpecs')
   end
       
+<<<<<<< HEAD:spec/scala/tests_spec.rb
   it 'should set current directory' do
     mkpath 'baz'
     expected = File.expand_path('baz')
@@ -305,6 +306,8 @@
     project('foo').test.passed_tests.should include('MySuite')
   end
 
+=======
+>>>>>>> Move test around:spec/scala/tests_spec.rb
   it 'should run with ScalaCheck automatic test case generation' do
     write 'src/test/scala/MySuite.scala', <<-SCALA
       import org.scalatest.prop.PropSuite