diff --git a/.travis.yml b/.travis.yml index 3f3268784c..4ebd2c32b6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,6 +28,9 @@ before_install: - chmod +x docker-compose - sudo mv docker-compose /usr/local/bin + - echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p + + cache: directories: - $HOME/.gradle/caches/ diff --git a/gradle/scripts/ember.gradle b/gradle/scripts/ember.gradle index 3c670a9e01..0940202d0d 100644 --- a/gradle/scripts/ember.gradle +++ b/gradle/scripts/ember.gradle @@ -27,18 +27,18 @@ task bowerInstall(type: NodeTask, dependsOn: yarn) { } task emberServe(type: NodeTask, dependsOn: bowerInstall) { - script = file('node_modules/ember-cli/bin/ember') + script = file('node_modules/.bin/ember') args = ['serve'] } task emberBuild(type: NodeTask, dependsOn: bowerInstall) { - script = file('node_modules/ember-cli/bin/ember') + script = file('node_modules/.bin/ember') args = ['build', '--environment', 'production'] } task emberTest(type: NodeTask, dependsOn: bowerInstall) { environment = ['COVERAGE': 'true'] - script = file('node_modules/ember-cli/bin/ember') + script = file('node_modules/.bin/ember') args = ['test', '--launch', 'Chrome'] } diff --git a/wherehows-web/tests/integration/components/datasets/containers/dataset-acl-access-test.js b/wherehows-web/tests/integration/components/datasets/containers/dataset-acl-access-test.js index a21ea0b901..d38774da8e 100644 --- a/wherehows-web/tests/integration/components/datasets/containers/dataset-acl-access-test.js +++ b/wherehows-web/tests/integration/components/datasets/containers/dataset-acl-access-test.js @@ -39,6 +39,6 @@ test('it renders', function(assert) { this.$() .text() .trim(), - '' + 'JIT ACL is not currently available for this dataset platform' ); });