Permalink
Browse files

Merge branch 'master' of github.com:robfletcher/grails-enhanced-scaff…

…olding

Conflicts:
	EnhancedScaffoldingGrailsPlugin.groovy
	application.properties
  • Loading branch information...
Rob Fletcher
Rob Fletcher committed Nov 17, 2011
2 parents 72f1a20 + fc11a3e commit b54d577050ef4b20111be7390f59ff18e4e73c7c
View
@@ -6,4 +6,6 @@
.DS_Store
/target/
/out/
-*.sha1
+*.sha1
+/.idea
+*.iml
@@ -1,6 +1,6 @@
class EnhancedScaffoldingGrailsPlugin {
- def version = "1.0.BUILD-SNAPSHOT"
+ def version = "1.0.RC2"
def grailsVersion = "2.0 > *"
def pluginExcludes = [
"grails-app/views/**/*",
@@ -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"
@@ -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 b54d577

Please sign in to comment.