Browse files

update to grails 2 and latest release plugin

  • Loading branch information...
1 parent c155334 commit cb60271ce1144b2d55d1231219eda1206261e5d2 Rob Fletcher committed Aug 4, 2011
View
4 .gitignore
@@ -6,4 +6,6 @@
.DS_Store
/target/
/out/
-*.sha1
+*.sha1
+/.idea
+*.iml
View
2 application.properties
@@ -1,4 +1,4 @@
#Grails Metadata file
#Wed Jun 01 15:16:27 BST 2011
-app.grails.version=1.4.0.M1
+app.grails.version=2.0.0.M1
app.name=enhanced-scaffolding
View
2 grails-app/conf/BuildConfig.groovy
@@ -17,7 +17,7 @@ grails.project.dependency.resolution = {
}
}
plugins {
- build(":tomcat:$grailsVersion", ":release:1.0.0.M2", ":svn:latest.integration") {
+ build(":tomcat:$grailsVersion", ":release:1.0.0.RC3", ":svn:latest.integration") {
export = false
}
compile ":jquery:1.6.1.1", ":modernizr:1.7.2"
View
16 test/cli/grails/plugin/scaffolding/PluginPackagingTests.groovy
@@ -13,19 +13,21 @@ class PluginPackagingTests extends AbstractCliTestCase {
}
@Test void unwantedConfigFilesAreNotBundledWithPlugin() {
- assertThat "Plugin zip contents", zipContents, hasItem(endsWith("EnhancedScaffoldingResources.groovy"))
- assertThat "Plugin zip contents", zipContents, not(hasItem(endsWith("BuildConfig.groovy")))
- assertThat "Plugin zip contents", zipContents, not(hasItem(endsWith("Config.groovy")))
- assertThat "Plugin zip contents", zipContents, not(hasItem(endsWith("DataSource.groovy")))
- assertThat "Plugin zip contents", zipContents, not(hasItem(endsWith("UrlMappings.groovy")))
+ def files = zipContents
+ println files
+ assertThat "Plugin zip contents", files, hasItem(endsWith("EnhancedScaffoldingResources.groovy"))
+ assertThat "Plugin zip contents", files, not(hasItem(endsWith("BuildConfig.groovy")))
+ assertThat "Plugin zip contents", files, not(hasItem(endsWith("Config.groovy")))
+ assertThat "Plugin zip contents", files, not(hasItem(endsWith("DataSource.groovy")))
+ assertThat "Plugin zip contents", files, not(hasItem(endsWith("UrlMappings.groovy")))
}
private ZipFile zipFile
@Before void packagePlugin() {
execute(["package-plugin"])
assert waitForProcess() == 0
- verifyHeader()
+// verifyHeader()
def packagedPlugin = new File("grails-enhanced-scaffolding-${pluginVersion}.zip")
assert packagedPlugin.isFile()
@@ -38,7 +40,7 @@ class PluginPackagingTests extends AbstractCliTestCase {
}
private Collection<String> getZipContents() {
- def entryNames = zipFile.entries()*.name
+ zipFile.entries()*.name
}
private String getPluginVersion() {

0 comments on commit cb60271

Please sign in to comment.