Merge branch 'ext-work'

4 files changed, 0 insertions, 109 deletions

diff --git a/addon-sdk/source/test/fixtures/preferences/curly-id/package.json b/addon-sdk/source/test/fixtures/preferences/curly-id/package.json
deleted file mode 100644
index 1d47b4d81..000000000
--- a/addon-sdk/source/test/fixtures/preferences/curly-id/package.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "id": "{34a1eae1-c20a-464f-9b0e-000000000000}",
-    "fullName": "curly ID test",
-    "author": "Tomislav Jovanovic",
-
-    "preferences": [{
-        "name": "test13",
-        "type": "integer",
-        "title": "test13",
-        "value": 26
-    }],
-
-    "preferences-branch": "invalid^branch*name"
-}
diff --git a/addon-sdk/source/test/fixtures/preferences/no-prefs/package.json b/addon-sdk/source/test/fixtures/preferences/no-prefs/package.json
deleted file mode 100644
index 7b243b41d..000000000
--- a/addon-sdk/source/test/fixtures/preferences/no-prefs/package.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "id": "no-prefs@jetpack",
-    "title": "No Prefs Test",
-    "author": "Erik Vold",
-    "loader": "lib/main.js"
-}
diff --git a/addon-sdk/source/test/fixtures/preferences/preferences-branch/package.json b/addon-sdk/source/test/fixtures/preferences/preferences-branch/package.json
deleted file mode 100644
index b738db7d0..000000000
--- a/addon-sdk/source/test/fixtures/preferences/preferences-branch/package.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "id": "test-preferences-branch",
-    "fullName": "preferences-branch test",
-    "author": "Tomislav Jovanovic",
-
-    "preferences": [{
-        "name": "test42",
-        "type": "bool",
-        "title": "test42",
-        "value": true
-    }],
-
-    "preferences-branch": "human-readable"
-}
diff --git a/addon-sdk/source/test/fixtures/preferences/simple-prefs/package.json b/addon-sdk/source/test/fixtures/preferences/simple-prefs/package.json
deleted file mode 100644
index d3b077ddf..000000000
--- a/addon-sdk/source/test/fixtures/preferences/simple-prefs/package.json
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-    "id": "simple-prefs@jetpack",
-    "title": "Simple Prefs Test",
-    "author": "Erik Vold",
-    "preferences": [{
-        "name": "test",
-        "type": "bool",
-        "title": "tëst",
-        "value": false,
-        "description": "descrïptiön"
-    },
-    {
-        "name": "test2",
-        "type": "string",
-        "title": "tëst",
-        "value": "ünicødé"
-    },
-    {
-        "name": "test3",
-        "type": "menulist",
-        "title": "\"><test",
-        "value": "1",
-        "options": [
-            {
-                "value": "0",
-                "label": "label1"
-            },
-            {
-                "value": "1",
-                "label": "label2"
-            }
-        ]
-    },
-    {
-        "name": "test4",
-        "type": "radio",
-        "title": "tëst",
-        "value": "red",
-        "options": [
-            {
-                "value": "red",
-                "label": "rouge"
-            },
-            {
-                "value": "blue",
-                "label": "bleu"
-            }
-        ]
-    },
-    {
-        "name": "test5",
-        "type": "boolint",
-        "title": "part part, particle",
-        "value": 7
-    },
-    {
-        "name": "test6",
-        "type": "color",
-        "title": "pop pop, popscicle",
-        "value": "#ff5e99"
-    },
-    {
-        "name": "test7",
-        "type": "file",
-        "title": "bike bike",
-        "value": "bicycle"
-    },
-    {
-        "name": "test8",
-        "type": "directory",
-        "title": "test test",
-        "value": "1-2-3"
-    }],
-    "loader": "lib/main.js"
-}