-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #249 from AtlasOfLivingAustralia/1.1.12
1.1.12
- Loading branch information
Showing
19 changed files
with
496 additions
and
307 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -246,8 +246,27 @@ environments { | |
| logging.dir = '.' | ||
| } | ||
| test { | ||
| server.port = "8087" | ||
| grails.host = "http://devt.ala.org.au" | ||
| serverName = "${grails.host}:${server.port}" | ||
| grails.serverURL = serverName + "/${appName}" | ||
| layout.skin = "nrm" | ||
| runWithNoExternalConfig = true | ||
| def casBaseUrl = "https://auth.ala.org.au" | ||
| security.cas.appServerName="${serverName}" | ||
| security.cas.contextPath="/${appName}" | ||
| security.cas.casServerName="${casBaseUrl}" | ||
| security.cas.uriFilterPattern=".*/user/.*,.*/site/(?!index).*,.*/project/(?!index).*,.*/activity/(?!index).*,.*/output/(?!index).*,.*/image/(?!index).*,.*/admin/.*,i.*/proxy/speciesListPost,.*/proxy/documentUpdate,.*/proxy/deleteDocument,.*/home/advanced,.*/organisation/(?!index).*,.*/organisation/(?!list).*" | ||
| security.cas.uriExclusionFilterPattern="/images.*,/css.*,/js.*,/less.*" | ||
| security.cas.authenticateOnlyIfLoggedInPattern="/,/;.*,/[A-Za-z0-9]+/?,.*/project/index.*,.*/site/index.*,.*/activity/index.*,.*/output/index.*,.*/ajax/keepSessionAlive,.*/search/.*,.*/home/.*,.*/organisation/index.*,.*/organisation/list.*" | ||
| gateway="true" | ||
| security.cas.casServerUrlPrefix="${casBaseUrl}/cas" | ||
| security.cas.loginUrl="${casServerUrlPrefix}/login" | ||
| logging.dir = '.' | ||
| test.user.admin.email = '[email protected]' | ||
| test.user.admin.password = 'testing!' | ||
| ecodata.baseUrl = 'http://devt.ala.org.au:8080/ecodata/ws/' | ||
|
|
||
| } | ||
| production { | ||
| grails.logging.jul.usebridge = false | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| #!/usr/bin/env bash | ||
| if [ -z "$1" ] | ||
| then | ||
| echo "No data set name argument supplied" | ||
| exit 1 | ||
| fi | ||
|
|
||
| export DATABASE_NAME=ecodata-test | ||
| export DATA_PATH=test/functional/resources/$1 | ||
|
|
||
| # Configure the ecodata-test database to be how the functional tests expect it. | ||
| mongoexport --db $DATABASE_NAME --collection organisation --out $DATA_PATH/organisation.json | ||
| mongoexport --db $DATABASE_NAME --collection userPermission --out $DATA_PATH/userPermission.json | ||
| mongoexport --db $DATABASE_NAME --collection project --out $DATA_PATH/project.json |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| #!/usr/bin/env bash | ||
| echo "This script should be run from the project root directory" | ||
| if [ -z "$1" ] | ||
| then | ||
| echo "No data set name argument supplied" | ||
| exit 1 | ||
| fi | ||
|
|
||
| export DATABASE_NAME=ecodata-test | ||
| export DATA_PATH=$1 | ||
|
|
||
| # Configure the ecodata-test database to be how the functional tests expect it. | ||
| mongo $DATABASE_NAME --eval "db.dropDatabase()" | ||
|
|
||
| # Configure the ecodata-test database to be how the functional tests expect it. | ||
| mongoimport --db $DATABASE_NAME --collection organisation --file $DATA_PATH/organisation.json | ||
| mongoimport --db $DATABASE_NAME --collection project --file $DATA_PATH/project.json | ||
| mongoimport --db $DATABASE_NAME --collection userPermission --file $DATA_PATH/userPermission.json | ||
| mongoimport --db $DATABASE_NAME --collection setting --file $DATA_PATH/setting.json | ||
|
|
||
|
|
||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| #!/usr/bin/env bash | ||
| export ECODATA_DIR=target/ecodata | ||
| export ECODATA_BRANCH=master | ||
|
|
||
| rm -rf $ECODATA_DIR | ||
| git clone https://github.com/AtlasOfLivingAustralia/ecodata.git $ECODATA_DIR | ||
| cd $ECODATA_DIR | ||
| git checkout $ECODATA_BRANCH | ||
|
|
||
|
|
||
| grails test run-app -Dgrails.server.port.http=8080& | ||
|
|
||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.