Skip to content

Commit

Permalink
- fixed functional test
Browse files Browse the repository at this point in the history
- ecodata-client-plugin:6.1.3
  • Loading branch information
temi committed Nov 27, 2023
1 parent 36c75f7 commit fd0bdbe
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 9 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,11 @@ jobs:
- name: Run javascript unit tests
run: node_modules/karma/bin/karma start karma.conf.js --single-run --browsers ChromeHeadless

# - name: Run BioCollect functional tests
# run: ./src/main/scripts/runFunctionalTests.sh chromeHeadless /tmp/ecodata feature/cognito
# env:
# GITHUB_ACTOR: ${{env.GITHUB_ACTOR}}
# GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
- name: Run BioCollect functional tests
run: ./src/main/scripts/runFunctionalTests.sh chromeHeadless /tmp/ecodata master
env:
GITHUB_ACTOR: ${{env.GITHUB_ACTOR}}
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

- name: Clean to remove clover instrumentation
uses: gradle/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ dependencies {

if (!Boolean.valueOf(inplace)) {
implementation "org.grails.plugins:ala-map-plugin:3.0.1"
implementation "org.grails.plugins:ecodata-client-plugin:6.1.3-SNAPSHOT"
implementation "org.grails.plugins:ecodata-client-plugin:6.1.3"
}

testCompileOnly "org.grails:grails-test-mixins:3.3.0"
Expand Down
7 changes: 4 additions & 3 deletions src/main/scripts/runFunctionalTests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,16 +39,17 @@ mongosh ecodata-functional-test loadAlaHub.js
echo "Hosts file configuration"
cat /etc/hosts

cd $BIOCOLLECT_DIR
echo "Starting wire mock"
./gradlew startWireMock &

cd $ECODATA_LOCAL_DIR
echo "Starting ecodata from `pwd`"
ls -la
GRADLE_OPTS="-Xmx1g" ./gradlew bootRun "-Dorg.gradle.jvmargs=-Xmx1g" -Dgrails.env=meritfunctionaltest &
sleep 240

cd $BIOCOLLECT_DIR
echo "Starting wire mock"
./gradlew startWireMock

echo "Starting biocollect"
GRADLE_OPTS="-Xmx1g" ./gradlew bootRun "-Dorg.gradle.jvmargs=-Xmx1g" -Dgrails.env=test -Dgrails.server.port.http=8087 &
sleep 200
Expand Down

0 comments on commit fd0bdbe

Please sign in to comment.