yujunjun/datahub
2
0
Fork 0
mirror of https://github.com/datahub-project/datahub.git synced 2025-09-02 22:03:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1302 from theseyi/travis-build-fix

Browse Source 
test travis build fix
This commit is contained in:
Seyi Adebajo 2018-08-07 01:30:42 -07:00 committed by GitHub
commit ac8d93f36e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@ -28,6 +28,9 @@ before_install:
- chmod +x docker-compose - chmod +x docker-compose
- sudo mv docker-compose /usr/local/bin - sudo mv docker-compose /usr/local/bin
- echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p
cache: cache:
directories: directories:
- $HOME/.gradle/caches/ - $HOME/.gradle/caches/

6
gradle/scripts/ember.gradle
View File

@ -27,18 +27,18 @@ task bowerInstall(type: NodeTask, dependsOn: yarn) {
} }
task emberServe(type: NodeTask, dependsOn: bowerInstall) { task emberServe(type: NodeTask, dependsOn: bowerInstall) {
script = file('node_modules/ember-cli/bin/ember') script = file('node_modules/.bin/ember')
args = ['serve'] args = ['serve']
} }
task emberBuild(type: NodeTask, dependsOn: bowerInstall) { task emberBuild(type: NodeTask, dependsOn: bowerInstall) {
script = file('node_modules/ember-cli/bin/ember') script = file('node_modules/.bin/ember')
args = ['build', '--environment', 'production'] args = ['build', '--environment', 'production']
} }
task emberTest(type: NodeTask, dependsOn: bowerInstall) { task emberTest(type: NodeTask, dependsOn: bowerInstall) {
environment = ['COVERAGE': 'true'] environment = ['COVERAGE': 'true']
script = file('node_modules/ember-cli/bin/ember') script = file('node_modules/.bin/ember')
args = ['test', '--launch', 'Chrome'] args = ['test', '--launch', 'Chrome']
} }

2
wherehows-web/tests/integration/components/datasets/containers/dataset-acl-access-test.js
View File

@ -39,6 +39,6 @@ test('it renders', function(assert) {
this.$() this.$()
.text() .text()
.trim(), .trim(),
'' 'JIT ACL is not currently available for this dataset platform'
); );
}); });