Skip to content

Commit

Permalink
V0.1.4
Browse files Browse the repository at this point in the history
  • Loading branch information
rdmueller committed Jan 21, 2015
2 parents dbf35b6 + 50c121e commit 62cf105
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 12 deletions.
4 changes: 2 additions & 2 deletions FilmStripGrailsPlugin.groovy
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
class FilmStripGrailsPlugin {
def version = "0.1.3"
def grailsVersion = "2.2 > *"
def version = "0.1.4"
def grailsVersion = "2.1 > *"
def pluginExcludes = [
"README.adoc",
"src/doc/**",
Expand Down
2 changes: 1 addition & 1 deletion README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ image::./src/doc/images/Screenshot.png["Screenshot", align="center"]

There is not much to do in order to use the plugin. Just configure it in your +BuildConfig.groovy+ as

test ":film-strip:0.1.3"
test ":film-strip:0.1.4"

and add the folowing line to your gebConfig.groovy:

Expand Down
13 changes: 7 additions & 6 deletions scripts/_Events.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
* limitations under the License.
*/


import groovy.json.JsonOutput
import org.codehaus.groovy.grails.plugins.GrailsPluginUtils
import geb.report.ReporterSupport
import grails.converters.JSON
Expand All @@ -23,7 +25,7 @@ import groovy.xml.MarkupBuilder
*
* @author Ralf D. Müller
*/
def pluginDir = GrailsPluginUtils.pluginInfos.find { it.name == "film-strip" }?.pluginDir
def pluginDir = GrailsPluginUtils.pluginInfos.find { it.name == "film-strip" }?.pluginDir.file.canonicalPath
if (!pluginDir) {
pluginDir = filmStripPluginDir
}
Expand Down Expand Up @@ -66,9 +68,8 @@ def convertJsonReport = {
}
}

def newJson = allReports as JSON
newJson.prettyPrint = true
new File(reportsDir, "gebReportInfo2.json").write(newJson.toString())
def newJson = JsonOutput.toJson(allReports)
new File(reportsDir, "gebReportInfo2.json").write(JsonOutput.prettyPrint(newJson))
}
//Script to generate a better Test-Report for Spock-Geb Tests
def createFilmStrip= {
Expand Down Expand Up @@ -165,8 +166,8 @@ def createFilmStrip= {
File reportFile = new File(reportsDir, "geb_report.html")
reportFile.write(xhtml.toString())

new File("./target/test-reports/geb/report.css").write(
new File(pluginDir.toString(), 'web-app/css/report.css').text
new File("$reportsDir/report.css").write(
new File(pluginDir, '/web-app/css/report.css').text
)

println "FilmStrip: created at '$reportFile.path'"
Expand Down
2 changes: 1 addition & 1 deletion src/doc/sections/01_introduction_and_goals.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ see if all pages display correctly.

There is not much to do in order to use the plugin. Just configure it in your ++BuildConfig.groovy++

test ':film-strip:0.1.3'
test ':film-strip:0.1.4'

and add the folowing line to your gebConfig.groovy:

Expand Down
1 change: 1 addition & 0 deletions src/doc/sections/appendix-contributing.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
* Marcin Erdmann - thoughts about monkey patch
* Burth Beckwith - cleanup of plugin code
* Peter Ledbrook - tipps on how to fix the plugin for grails 2.4.4
* Tobias Kraft - support for Grails 2.1.*

== Contributing

Expand Down
11 changes: 11 additions & 0 deletions src/doc/sections/appendix-openissues.adoc
Original file line number Diff line number Diff line change
@@ -1,6 +1,17 @@
:numbered!:

[appendix]
== Changelog

[options="header",cols="1,10"]
|====
|Version | Description
|0.1.1 | Initial Version
|0.1.2 | -
|0.1.3 | support for packages
|0.1.4 | support for Grails 2.1
|====

== Open Issues

In order to work offline on this project, all open issues are exported to this
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package grails.plugin.filmstrip
import geb.report.ReportState
import geb.report.Reporter
import geb.report.ReportingListener
import grails.converters.JSON
import groovy.json.JsonOutput

/**
* Extracts all information gathered as JSON to a file which is later processed
Expand Down Expand Up @@ -37,6 +37,7 @@ class FilmStripReportingListener implements ReportingListener {
]
]
]
out << (res as JSON).toString()+"\n"

out << JsonOutput.toJson(res)+"\n"
}
}

0 comments on commit 62cf105

Please sign in to comment.