Permalink
Browse files

Upgrade to Grails 2.3.0

  • Loading branch information...
mraible committed Sep 24, 2013
1 parent 2b878a0 commit 801eca879dfeed208605db897eff8b77fa07bd29
View
@@ -1,5 +1,6 @@
#Grails Metadata file
#Wed Mar 13 20:19:13 MDT 2013
app.grails.version=2.2.1
#Tue Sep 10 10:12:05 MDT 2013
app.grails.version=2.3.0
app.name=happytrails
app.version=2.0
#app.servlet.version=3.0
app.version=3.0
@@ -6,6 +6,7 @@ grails.project.target.level = 1.6
grails.project.source.level = 1.6
//grails.project.war.file = "target/${appName}-${appVersion}.war"
grails.project.dependency.resolver = "maven"
grails.project.dependency.resolution = {
// inherit Grails' default dependencies
inherits("global") {
@@ -22,10 +23,11 @@ grails.project.dependency.resolution = {
grailsCentral()
mavenLocal()
mavenCentral()
mavenRepo "http://repo.grails.org/grails/core"
}
def gebVersion = "0.9.0-RC-1"
def seleniumVersion = "2.27.0"
def gebVersion = "0.9.1"
def seleniumVersion = "2.31.0"
def spockVersion = "0.7"
dependencies {
@@ -36,6 +38,10 @@ grails.project.dependency.resolution = {
}
test("org.seleniumhq.selenium:selenium-chrome-driver:$seleniumVersion")
test("org.seleniumhq.selenium:selenium-firefox-driver:$seleniumVersion")
test "org.seleniumhq.selenium:selenium-remote-driver:$seleniumVersion"
test("com.github.detro.ghostdriver:phantomjsdriver:1.0.1") {
transitive = false
}
test('dumbster:dumbster:1.6') {
excludes 'mail', 'activation'
@@ -46,7 +52,8 @@ grails.project.dependency.resolution = {
}
plugins {
compile ":cache:1.0.1"
compile ":scaffolding:2.0.0"
compile ':cache:1.1.1'
compile ":cache-headers:1.1.5"
compile ":cloud-bees:0.6.2"
compile ":commentable:0.8.1"
@@ -56,24 +63,26 @@ grails.project.dependency.resolution = {
compile ":mail:1.0.1"
compile ":quartz:1.0-RC5"
compile ":rateable:0.7.1"
compile ":searchable:0.6.4"
compile ":searchable:0.6.5-SNAPSHOT"
compile ":seofriendly-urls:1.0.2"
compile ":spring-security-core:1.2.7.3"
compile ":spring-security-ui:0.2"
test ":geb:$gebVersion"
test ":remote-control:1.4"
test(":spock:$spockVersion") {
exclude "spock-grails-support"
}
runtime ":hibernate:$grailsVersion"
runtime ":hibernate:3.6.10.1" // or ":hibernate4:4.1.11.1"
runtime ":database-migration:1.3.5"
runtime ":jquery:1.9.1"
runtime ":resources:1.2"
runtime ":zipped-resources:1.0.1"
runtime ":cached-resources:1.1"
runtime ":yui-minify-resources:0.1.5"
build ":tomcat:$grailsVersion"
build ":tomcat:7.0.41"
}
}
@@ -155,3 +155,27 @@ grails.cache.config = {
name 'region'
}
}
// Uncomment and edit the following lines to start using Grails encoding & escaping improvements
/* remove this line
// GSP settings
grails {
views {
gsp {
encoding = 'UTF-8'
htmlcodec = 'xml' // use xml escaping instead of HTML4 escaping
codecs {
expression = 'html' // escapes values inside null
scriptlet = 'none' // escapes output from scriptlets in GSPs
taglib = 'none' // escapes output from taglibs
staticparts = 'none' // escapes output from static template parts
}
}
// escapes all not-encoded output at final stage of outputting
filteringCodecForContentType {
//'text/html' = 'html'
}
}
}
remove this line */
@@ -19,6 +19,9 @@ environments {
}
test {
dataSource {
driverClassName = "org.h2.Driver"
username = "sa"
password = ""
dbCreate = "update"
url = "jdbc:h2:mem:testDb;MVCC=TRUE"
}
@@ -11,6 +11,7 @@ class Route implements Rateable, Commentable {
static transients = ["averageRating"]
static constraints = {
id bindable:true
name blank: false, unique: true, matches: charactersNumbersAndSpaces
description nullable: true
distance blank: false, min: 0.1D
View
@@ -325,23 +325,6 @@
</configuration>
</component>
<component name="ShelveChangesManager" show_recycled="false" />
<component name="SvnConfiguration" maxAnnotateRevisions="500">
<option name="USER" value="" />
<option name="PASSWORD" value="" />
<option name="mySSHConnectionTimeout" value="30000" />
<option name="mySSHReadTimeout" value="30000" />
<option name="LAST_MERGED_REVISION" />
<option name="MERGE_DRY_RUN" value="false" />
<option name="MERGE_DIFF_USE_ANCESTRY" value="true" />
<option name="UPDATE_LOCK_ON_DEMAND" value="false" />
<option name="IGNORE_SPACES_IN_MERGE" value="false" />
<option name="DETECT_NESTED_COPIES" value="true" />
<option name="CHECK_NESTED_FOR_QUICK_MERGE" value="false" />
<option name="IGNORE_SPACES_IN_ANNOTATE" value="true" />
<option name="SHOW_MERGE_SOURCES_IN_ANNOTATE" value="true" />
<option name="FORCE_UPDATE" value="false" />
<myIsUseDefaultProxy>false</myIsUseDefaultProxy>
</component>
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
</component>
Binary file not shown.
@@ -1,20 +1,16 @@
/*
This is the Geb configuration file.
See: http://www.gebish.org/manual/current/configuration.html
*/
import org.openqa.selenium.htmlunit.HtmlUnitDriver
import org.openqa.selenium.phantomjs.PhantomJSDriver
import org.openqa.selenium.remote.DesiredCapabilities
import org.openqa.selenium.firefox.FirefoxDriver
import org.openqa.selenium.chrome.ChromeDriver
// Use htmlunit as the default
// See: http://code.google.com/p/selenium/wiki/HtmlUnitDriver
driver = {
def driver = new HtmlUnitDriver()
driver.javascriptEnabled = true
driver
new PhantomJSDriver(new DesiredCapabilities())
}
private void downloadDriver(File file, String path) {
@@ -33,7 +29,7 @@ environments {
// See: http://code.google.com/p/selenium/wiki/ChromeDriver
chrome {
def chromeDriver = new File('test/drivers/chrome/chromedriver')
downloadDriver(chromeDriver, "http://chromedriver.googlecode.com/files/chromedriver_mac_26.0.1383.0.zip")
downloadDriver(chromeDriver, "http://chromedriver.googlecode.com/files/chromedriver_mac32_2.2.zip")
System.setProperty('webdriver.chrome.driver', chromeDriver.absolutePath)
driver = { new ChromeDriver() }
}
@@ -3,7 +3,7 @@ package happytrails.pages
class HomePage extends ScaffoldPage {
static at = {
$('title').text() ==~ /Welcome to Happy Trails!.+/
title ==~ /Welcome to Happy Trails!.+/
}
static content = {
@@ -6,8 +6,8 @@ class RegionsPage extends ScaffoldPage {
static url = "regions"
static at = {
title ==~ /Regions/
}
title.startsWith('Regions')
}
static content = {
newRegionButton(to: AddRegionPage) { $("a", text: "New Region") }
@@ -4,8 +4,8 @@ class SignupPage extends ScaffoldPage {
static url = "signup"
static at = {
$('.ui-dialog-title').text() ==~ /Create Account!.+/
}
title == "Register"
}
static content = {
form { $("form") }
@@ -1,12 +1,13 @@
package happytrails
import grails.test.mixin.*
import org.junit.Ignore
@TestFor(DirectionController)
@Mock([Direction, Route])
class DirectionControllerTests {
def populateValidParams(params) {
static def populateValidParams(params) {
assert params != null
params["stepNumber"] = '1'
params["instruction"] = 'Go right at the river'
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<bean id="grailsApplication" class="org.codehaus.groovy.grails.commons.GrailsApplicationFactoryBean">
<description>Grails application factory bean</description>
@@ -30,4 +29,6 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schem
<value>utf-8</value>
</property>
</bean>
<bean id="conversionService" class="org.springframework.context.support.ConversionServiceFactoryBean" />
</beans>
Oops, something went wrong.

0 comments on commit 801eca8

Please sign in to comment.