do not include rubygems in test-classes for rails projects

douglasrodrigo · Jul 3, 2011 · c10acde · c10acde
1 parent b937d85
commit c10acde
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/ruby-tools/pom.xml b/ruby-tools/pom.xml
@@ -112,7 +112,8 @@
 	  <plugin>
 	    <groupId>de.saumya.mojo</groupId>
 	    <artifactId>rspec-maven-plugin</artifactId>
-	    <version>${project.version}</version>
+            <!-- hardcode it so integration tests run on new version -->
+	    <version>0.28.3</version>
 	    <configuration>
 	      <specSourceDirectory>src/test/spec</specSourceDirectory>
 	    </configuration>

diff --git a/ruby-tools/src/main/ruby/maven/tools/rails_project.rb b/ruby-tools/src/main/ruby/maven/tools/rails_project.rb
@@ -33,6 +33,7 @@ def add_defaults(args = {})
         self.properties = {
           "jetty.version" => versions[:jetty_plugin],
           "rails.env" => "development",
+          "gem.includeRubygemsInTestResources" => false
         }.merge(self.properties)
 
         plugin(:rails3) do |rails|

diff --git a/ruby-tools/src/test/spec/maven/tools/rails_project_spec.rb b/ruby-tools/src/test/spec/maven/tools/rails_project_spec.rb
@@ -71,6 +71,7 @@
   </dependencies>
   <properties>
     <gem.home>${project.build.directory}/rubygems</gem.home>
+    <gem.includeRubygemsInTestResources>false</gem.includeRubygemsInTestResources>
     <gem.path>${project.build.directory}/rubygems</gem.path>
     <jetty.version>7.4.2.v20110526</jetty.version>
     <jruby.plugins.version>@project.version@</jruby.plugins.version>