Auto install latest https-e in test script

diracdeltas · diracdeltas · commit 45ec4f9b37d7 · 2014-07-24T10:35:29.000-07:00
diff --git a/.gitignore b/.gitignore
@@ -11,3 +11,4 @@ tokenkeys.py*
 .idea
 *.pyc
 from-preloads/
+test_profile/
diff --git a/https-everywhere-tests/README.md b/https-everywhere-tests/README.md
@@ -4,8 +4,12 @@
 * Latest release of the Firefox Add-On SDK: https://developer.mozilla.org/en-US/Add-ons/SDK/Tutorials/Installation
 
 ## Instructions
-1. Create a clean Firefox profile and install the HTTPS Everywhere XPI that you wish to test (TODO: script this).
-2. Copy the profile to `/tmp/test_profile` (TODO: make this configurable).
-3. Activate the Add-on SDK.
-4. cd to your HTTPS Everywhere repository root and run `./test.sh`.
-5. To add tests, put them in `./https-everywhere-tests/tests`.
+### First time
+1. Create a clean Firefox profile and install HTTPS Everywhere.
+2. Copy the profile to `./test_profile` (TODO: make this configurable).
+
+### Every time
+1. Activate the Add-on SDK.
+2. cd to your HTTPS Everywhere repository root and run `./test.sh`.
+
+To add tests, put them in `./https-everywhere-tests/tests`.
diff --git a/https-everywhere-tests/doc/main.md b/https-everywhere-tests/doc/main.md
diff --git a/test.sh b/test.sh
@@ -8,7 +8,8 @@ TEST_ADDON_PATH=./https-everywhere-tests/
 LATEST_SDK_VERSION=1.16
 
 # firefox profile that has HTTPS Everywhere installed
-PROFILE_DIRECTORY=/tmp/test_profile
+PROFILE_DIRECTORY=./test_profile
+HTTPSE_INSTALL_DIRECTORY=./test_profile/extensions/https-everywhere@eff.org
 
 if [ ! -d "$TEST_ADDON_PATH" ]; then
   echo "Test addon path does not exist"
@@ -20,6 +21,11 @@ if [ ! -d "$PROFILE_DIRECTORY" ]; then
   exit 1
 fi
 
+if [ ! -d "$HTTPSE_INSTALL_DIRECTORY" ]; then
+  echo "Firefox profile does not have HTTPS Everywhere installed"
+  exit 1
+fi
+
 if ! type cfx > /dev/null; then
   echo "Please activate the Firefox Addon SDK before running this script."
   exit 1
@@ -30,6 +36,9 @@ if ! cfx --version | grep -q "$LATEST_SDK_VERSION"; then
     exit 1
 fi
 
-cd $TEST_ADDON_PATH
+cd src/
+rsync -av --exclude-from="../.build_exclusions" . ../$HTTPSE_INSTALL_DIRECTORY
+
+cd ../$TEST_ADDON_PATH
 echo "running tests"
-cfx test --profiledir=$PROFILE_DIRECTORY --verbose
+cfx test --profiledir="../$PROFILE_DIRECTORY" --verbose
