From ae4297519a3172c8725f92fd791d1ddc9734e367 Mon Sep 17 00:00:00 2001
From: Amjad Mash'al <nav@unlicrea.com>
Date: Thu, 10 Sep 2015 17:04:51 +0200
Subject: [PATCH] Moving https-everywhere-tests to test/firefox

---
 test/firefox.sh                                               | 4 ++--
 {https-everywhere-tests => test/firefox}/README.md            | 0
 {https-everywhere-tests => test/firefox}/lib/main.js          | 0
 {https-everywhere-tests => test/firefox}/package.json         | 0
 .../firefox}/test/test-httpse-installed.js                    | 0
 {https-everywhere-tests => test/firefox}/test/test-main.js    | 0
 .../firefox}/test_profile_skeleton/README                     | 0
 .../firefox}/test_profile_skeleton/extensions.ini             | 0
 .../firefox}/test_profile_skeleton/extensions.json            | 0
 .../firefox}/test_profile_skeleton/extensions/placeholder     | 0
 .../firefox}/test_profile_skeleton/prefs.js                   | 0
 11 files changed, 2 insertions(+), 2 deletions(-)
 rename {https-everywhere-tests => test/firefox}/README.md (100%)
 rename {https-everywhere-tests => test/firefox}/lib/main.js (100%)
 rename {https-everywhere-tests => test/firefox}/package.json (100%)
 rename {https-everywhere-tests => test/firefox}/test/test-httpse-installed.js (100%)
 rename {https-everywhere-tests => test/firefox}/test/test-main.js (100%)
 rename {https-everywhere-tests => test/firefox}/test_profile_skeleton/README (100%)
 rename {https-everywhere-tests => test/firefox}/test_profile_skeleton/extensions.ini (100%)
 rename {https-everywhere-tests => test/firefox}/test_profile_skeleton/extensions.json (100%)
 rename {https-everywhere-tests => test/firefox}/test_profile_skeleton/extensions/placeholder (100%)
 rename {https-everywhere-tests => test/firefox}/test_profile_skeleton/prefs.js (100%)

diff --git a/test/firefox.sh b/test/firefox.sh
index 3856a5c01d3c..6cc7219d4bc9 100755
--- a/test/firefox.sh
+++ b/test/firefox.sh
@@ -15,7 +15,7 @@ fi
 source utils/mktemp.sh
 
 # dummy Jetpack addon that contains tests
-TEST_ADDON_PATH=./https-everywhere-tests/
+TEST_ADDON_PATH=./test/firefox/
 
 # We'll create a Firefox profile here and install HTTPS Everywhere into it.
 PROFILE_DIRECTORY="$(mktemp -d)"
@@ -30,7 +30,7 @@ XPI_NAME="`ls -tr pkg/*-eff.xpi | tail -1`"
 # Set up a skeleton profile and then install into it.
 # The skeleton contains a few files required to trick Firefox into thinking
 # that the extension was fully installed rather than just unpacked.
-rsync -a https-everywhere-tests/test_profile_skeleton/ $PROFILE_DIRECTORY
+rsync -a test/firefox/test_profile_skeleton/ $PROFILE_DIRECTORY
 unzip -qd $HTTPSE_INSTALL_DIRECTORY $XPI_NAME
 
 die() {
diff --git a/https-everywhere-tests/README.md b/test/firefox/README.md
similarity index 100%
rename from https-everywhere-tests/README.md
rename to test/firefox/README.md
diff --git a/https-everywhere-tests/lib/main.js b/test/firefox/lib/main.js
similarity index 100%
rename from https-everywhere-tests/lib/main.js
rename to test/firefox/lib/main.js
diff --git a/https-everywhere-tests/package.json b/test/firefox/package.json
similarity index 100%
rename from https-everywhere-tests/package.json
rename to test/firefox/package.json
diff --git a/https-everywhere-tests/test/test-httpse-installed.js b/test/firefox/test/test-httpse-installed.js
similarity index 100%
rename from https-everywhere-tests/test/test-httpse-installed.js
rename to test/firefox/test/test-httpse-installed.js
diff --git a/https-everywhere-tests/test/test-main.js b/test/firefox/test/test-main.js
similarity index 100%
rename from https-everywhere-tests/test/test-main.js
rename to test/firefox/test/test-main.js
diff --git a/https-everywhere-tests/test_profile_skeleton/README b/test/firefox/test_profile_skeleton/README
similarity index 100%
rename from https-everywhere-tests/test_profile_skeleton/README
rename to test/firefox/test_profile_skeleton/README
diff --git a/https-everywhere-tests/test_profile_skeleton/extensions.ini b/test/firefox/test_profile_skeleton/extensions.ini
similarity index 100%
rename from https-everywhere-tests/test_profile_skeleton/extensions.ini
rename to test/firefox/test_profile_skeleton/extensions.ini
diff --git a/https-everywhere-tests/test_profile_skeleton/extensions.json b/test/firefox/test_profile_skeleton/extensions.json
similarity index 100%
rename from https-everywhere-tests/test_profile_skeleton/extensions.json
rename to test/firefox/test_profile_skeleton/extensions.json
diff --git a/https-everywhere-tests/test_profile_skeleton/extensions/placeholder b/test/firefox/test_profile_skeleton/extensions/placeholder
similarity index 100%
rename from https-everywhere-tests/test_profile_skeleton/extensions/placeholder
rename to test/firefox/test_profile_skeleton/extensions/placeholder
diff --git a/https-everywhere-tests/test_profile_skeleton/prefs.js b/test/firefox/test_profile_skeleton/prefs.js
similarity index 100%
rename from https-everywhere-tests/test_profile_skeleton/prefs.js
rename to test/firefox/test_profile_skeleton/prefs.js