Created
July 22, 2015 14:06
-
-
Save mstriemer/ca501e2c9e73abea927b to your computer and use it in GitHub Desktop.
This file contains hidden or 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
From c6773f24cabb0cd39acc6917323384df84246943 Mon Sep 17 00:00:00 2001 | |
From: Mark Striemer <[email protected]> | |
Date: Wed, 22 Jul 2015 09:05:31 -0500 | |
Subject: [PATCH] Use custom settings file for WebQA Travis tests | |
--- | |
.travis.yml | 4 ++-- | |
Makefile | 1 + | |
src/media/js/settings_local_webqa.js | 11 +++++++++++ | |
3 files changed, 14 insertions(+), 2 deletions(-) | |
create mode 100644 src/media/js/settings_local_webqa.js | |
diff --git a/.travis.yml b/.travis.yml | |
index 62837fc..1eef4d3 100644 | |
--- a/.travis.yml | |
+++ b/.travis.yml | |
@@ -27,7 +27,7 @@ env: | |
matrix: | |
- RUN_TEST=uitest-phantom START_SERVER=1 UPLOAD_CAPTURES=1 MAKE_LANGPACKS=1 | |
- RUN_TEST=uitest-slimer START_SERVER=1 UPLOAD_CAPTURES=1 MAKE_LANGPACKS=1 | |
- - RUN_TEST=uitest-webqa API=dev START_SERVER=1 | |
+ - RUN_TEST=uitest-webqa START_SERVER=1 | |
- RUN_TEST=sherlocked API=mock START_SERVER=1 MAKE_LANGPACKS=1 | |
- RUN_TEST=lint | |
- RUN_TEST=unittest | |
@@ -42,7 +42,7 @@ matrix: | |
allow_failures: | |
- env: RUN_TEST=uitest-phantom START_SERVER=1 UPLOAD_CAPTURES=1 MAKE_LANGPACKS=1 | |
- env: RUN_TEST=sherlocked API=mock START_SERVER=1 MAKE_LANGPACKS=1 | |
- - env: RUN_TEST=uitest-webqa API=dev START_SERVER=1 | |
+ - env: RUN_TEST=uitest-webqa START_SERVER=1 | |
before_script: | |
- export PHANTOMJS_EXECUTABLE='phantomjs --local-to-remote-url-access=yes --ignore-ssl-errors=yes' | |
- export SLIMERJSLAUNCHER=$(which firefox) | |
diff --git a/Makefile b/Makefile | |
index 20531e3..fb1eaed 100644 | |
--- a/Makefile | |
+++ b/Makefile | |
@@ -95,3 +95,4 @@ install-webqa: | |
test -d ${WEBQA_TESTS} || git clone --depth 1 https://github.com/mozilla/marketplace-tests/ ${WEBQA_TESTS} | |
git -C ${WEBQA_TESTS} pull | |
${WEBQA_VENV}/bin/pip install -Ur ${WEBQA_TESTS}/requirements.txt | |
+ cp src/media/js/settings_local_webqa.js src/media/js/settings_local.js | |
diff --git a/src/media/js/settings_local_webqa.js b/src/media/js/settings_local_webqa.js | |
new file mode 100644 | |
index 0000000..db2abd5 | |
--- /dev/null | |
+++ b/src/media/js/settings_local_webqa.js | |
@@ -0,0 +1,11 @@ | |
+define('settings_local', | |
+ [], | |
+ function() { | |
+ | |
+ return { | |
+ api_url: 'https://marketplace-dev.allizom.org', | |
+ manifest_url: 'https://marketplace-dev.allizom.org/packaged.webapp', | |
+ media_url: 'https://marketplace-dev.allizom.org/media', | |
+ meowEnabled: true | |
+ }; | |
+}); | |
-- | |
2.2.1 | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment