Merge branch 'ext-work'

6 files changed, 0 insertions, 61 deletions

diff --git a/addon-sdk/source/test/fixtures/native-overrides-test/ignore.js b/addon-sdk/source/test/fixtures/native-overrides-test/ignore.js
deleted file mode 100644
index 02539eb79..000000000
--- a/addon-sdk/source/test/fixtures/native-overrides-test/ignore.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-'use strict';
-
-exports.bar = "do not ignore this export";
diff --git a/addon-sdk/source/test/fixtures/native-overrides-test/index.js b/addon-sdk/source/test/fixtures/native-overrides-test/index.js
deleted file mode 100644
index ef0b6bba1..000000000
--- a/addon-sdk/source/test/fixtures/native-overrides-test/index.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-'use strict';
-
-var foo = require("foo");
-var coolTabs = require("cool-tabs");
-
-exports.foo = foo.fs;
-exports.bar = foo.bar;
-exports.fs = require("sdk/io/fs");
-exports.extra = require("fs-extra").extra;
-exports.overload = require("overload");
-exports.overloadLib = require("overload/lib/foo.js");
-exports.internal = require("internal").internal;
-exports.Tabs = require("sdk/tabs").Tabs;
-exports.CoolTabs = coolTabs.Tabs;
-exports.CoolTabsLib = coolTabs.TabsLib;
-exports.ignore = require("./lib/ignore").foo;
diff --git a/addon-sdk/source/test/fixtures/native-overrides-test/lib/ignore.js b/addon-sdk/source/test/fixtures/native-overrides-test/lib/ignore.js
deleted file mode 100644
index d37a7827a..000000000
--- a/addon-sdk/source/test/fixtures/native-overrides-test/lib/ignore.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-'use strict';
-
-exports.foo = require("../ignore").bar;
diff --git a/addon-sdk/source/test/fixtures/native-overrides-test/lib/internal.js b/addon-sdk/source/test/fixtures/native-overrides-test/lib/internal.js
deleted file mode 100644
index 2d5f419fd..000000000
--- a/addon-sdk/source/test/fixtures/native-overrides-test/lib/internal.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-'use strict';
-
-exports.internal = "test";
diff --git a/addon-sdk/source/test/fixtures/native-overrides-test/lib/tabs.js b/addon-sdk/source/test/fixtures/native-overrides-test/lib/tabs.js
deleted file mode 100644
index 20f59551e..000000000
--- a/addon-sdk/source/test/fixtures/native-overrides-test/lib/tabs.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-'use strict';
-
-exports.Tabs = "no tabs exist";
diff --git a/addon-sdk/source/test/fixtures/native-overrides-test/package.json b/addon-sdk/source/test/fixtures/native-overrides-test/package.json
deleted file mode 100644
index 346cf76f5..000000000
--- a/addon-sdk/source/test/fixtures/native-overrides-test/package.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "name": "native-overrides-test",
-  "main": "index.js",
-  "dependencies": {
-    "cool-tabs": "*",
-    "foo": "*",
-    "fs-extra": "*"
-  },
-  "jetpack": {
-    "overrides": {
-      "fs": "sdk/io/fs",
-      "overload": "foo",
-      "internal": "./lib/internal",
-      "sdk/tabs": "./lib/tabs",
-      "../ignore": "foo"
-    }
-  }
-}