diff --git a/.travis.yml b/.travis.yml index 0aea4e16d..a96c8dacb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,9 @@ language: java +sudo: false + +addons: + firefox: "53.0" + jdk: - oraclejdk8 @@ -35,7 +40,9 @@ script: - mvn -e test -P \!htmlUnit - BASE_PATH=`pwd` - pushd tests/src/test/js - - firefox index.html & + - mkdir profile + - cp user.js profile/user.js + - firefox index.html -v --profile profile --setDefaultBrowser & - FIREFOX_PID=$! - node start.js $BASE_PATH/tests/target/js-tests - node start.js $BASE_PATH/html4j/target/js-tests diff --git a/tests/pom.xml b/tests/pom.xml index 42571fee0..594f0ee5c 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -86,7 +86,6 @@ maven-surefire-plugin 2.16 - true -Xmx512m ${project.build.directory}/js-tests diff --git a/tests/src/test/js/src/run-tests.js b/tests/src/test/js/src/run-tests.js index de1c6b663..5f6cff1e5 100644 --- a/tests/src/test/js/src/run-tests.js +++ b/tests/src/test/js/src/run-tests.js @@ -49,12 +49,11 @@ async function runAll() { console.log("Running tests"); - const server = http.createServer((request, response) => { response.writeHead(404); response.end(); }); - server.listen(9090, () => { + server.listen({ host: "localhost", port: 9090 }, () => { console.log((new Date()) + ' Server is listening on port 9090'); }); diff --git a/tests/src/test/js/user.js b/tests/src/test/js/user.js new file mode 100644 index 000000000..91ec26d23 --- /dev/null +++ b/tests/src/test/js/user.js @@ -0,0 +1,18 @@ +/* + * Copyright 2017 Alexey Andreev. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +user_pref("browser.dom.window.dump.enabled", true); +user_pref("browser.shell.checkDefaultBrowser", false); \ No newline at end of file