updated spock test project to newest plugin version

gpc · Jun 16, 2010 · e3725cf · e3725cf
1 parent ab99801
commit e3725cf
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 6 deletions.
diff --git a/grails-app/conf/spring/.gitignore b/grails-app/conf/spring/.gitignore
diff --git a/grails-selenium-rc.iml b/grails-selenium-rc.iml
@@ -7,6 +7,7 @@
           <root url="file://$MODULE_DIR$/web-app" relative="/" />
           <root url="file://$MODULE_DIR$/web-app" relative="/" />
           <root url="file://$MODULE_DIR$/web-app" relative="/" />
+          <root url="file://$MODULE_DIR$/web-app" relative="/" />
         </webroots>
         <sourceRoots />
         <context-artifact name="grails-selenium-rc:GrailsWeb exploded" />
@@ -17,6 +18,7 @@
         <fileset id="Grails" name="Grails" removed="false">
           <file>file://$MODULE_DIR$/web-app/WEB-INF/applicationContext.xml</file>
           <file>file://$MODULE_DIR$/web-app/WEB-INF/applicationContext.xml</file>
+          <file>file://$MODULE_DIR$/web-app/WEB-INF/applicationContext.xml</file>
         </fileset>
       </configuration>
     </facet>
@@ -28,20 +30,25 @@
       <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/test/unit" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/test/cli" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/grails-app/utils" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/grails-app/controllers" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/grails-app/domain" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/grails-app/services" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/grails-app/taglib" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/test/integration" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
       <excludeFolder url="file://$MODULE_DIR$/.settings" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="grails-1.3.1" level="application" />
     <orderEntry type="module-library" exported="">
       <library name="Grails User Library">
         <CLASSES>
           <root url="file://$MODULE_DIR$/lib" />
           <root url="jar://$USER_HOME$/.ivy2/cache/org.gmock/gmock/jars/gmock-0.8.0.jar!/" />
-          <root url="jar://$USER_HOME$/.ivy2/cache/org.seleniumhq.selenium.client-drivers/selenium-java-client-driver/jars/selenium-java-client-driver-1.0.2.jar!/" />
           <root url="jar://$USER_HOME$/.ivy2/cache/org.hamcrest/hamcrest-all/jars/hamcrest-all-1.1.jar!/" />
+          <root url="jar://$USER_HOME$/.ivy2/cache/org.hamcrest/hamcrest-all/sources/hamcrest-all-1.1-sources.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>

diff --git a/test/cli/grails/plugin/selenium/packaging/PluginPackagingTests.groovy b/test/cli/grails/plugin/selenium/packaging/PluginPackagingTests.groovy
@@ -46,7 +46,7 @@ class PluginPackagingTests extends AbstractCliTestCase {
 	}
 
 	def getPluginVersion() {
-		"1.0.2-SNAPSHOT" // TODO: work this out rather than hardcoding
+		"1.0.2" // TODO: work this out rather than hardcoding
 	}
 
 }
diff --git a/test/projects/selenium-with-spock/application.properties b/test/projects/selenium-with-spock/application.properties
@@ -1,11 +1,11 @@
 #Grails Metadata file
-#Tue Apr 20 13:48:35 BST 2010
+#Wed Jun 16 18:18:43 BST 2010
 app.grails.version=1.2.2
 app.name=selenium-with-spock
 app.servlet.version=2.4
 app.version=0.1
 plugins.build-test-data=0.2.3
 plugins.hibernate=1.2.2
 plugins.joda-time=0.5
-plugins.spock=0.4-SNAPSHOT
+plugins.spock=0.4-groovy-1.6
 plugins.tomcat=1.2.2
diff --git a/test/projects/selenium-with-spock/selenium-with-spock.iml b/test/projects/selenium-with-spock/selenium-with-spock.iml
@@ -8,6 +8,7 @@
           <root url="file://$MODULE_DIR$/web-app" relative="/" />
           <root url="file://$MODULE_DIR$/web-app" relative="/" />
           <root url="file://$MODULE_DIR$/web-app" relative="/" />
+          <root url="file://$MODULE_DIR$/web-app" relative="/" />
         </webroots>
         <sourceRoots />
       </configuration>
@@ -19,6 +20,7 @@
           <file>file://$MODULE_DIR$/web-app/WEB-INF/applicationContext.xml</file>
           <file>file://$MODULE_DIR$/web-app/WEB-INF/applicationContext.xml</file>
           <file>file://$MODULE_DIR$/web-app/WEB-INF/applicationContext.xml</file>
+          <file>file://$MODULE_DIR$/web-app/WEB-INF/applicationContext.xml</file>
         </fileset>
       </configuration>
     </facet>
@@ -32,6 +34,11 @@
       <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/test/selenium" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/test/functional" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/grails-app/utils" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/grails-app/services" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/grails-app/taglib" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/test/unit" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/test/integration" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />
@@ -40,9 +47,12 @@
     <orderEntry type="library" name="grails-1.2.2" level="application" />
     <orderEntry type="module-library">
       <library name="Grails User Library">
-        <CLASSES />
+        <CLASSES>
+          <root url="file://$MODULE_DIR$/lib" />
+        </CLASSES>
         <JAVADOC />
         <SOURCES />
+        <jarDirectory url="file://$MODULE_DIR$/lib" recursive="false" />
       </library>
     </orderEntry>
     <orderEntry type="module" module-name="grails-selenium-rc" />