aboutsummaryrefslogtreecommitdiffstats
path: root/tests/unit_tests
diff options
context:
space:
mode:
authormrmr19932015-04-27 20:08:11 +0100
committermrmr19932015-05-29 12:06:00 +0100
commit0c12810c4c49ade77a1c8a8b3172857e19eb01f0 (patch)
treeacd1da490584d57aa242a1cceed5803b39ed0c17 /tests/unit_tests
parentbfe304932b13eb1bfe65662490d3d6b830eefec7 (diff)
downloadvimium-0c12810c4c49ade77a1c8a8b3172857e19eb01f0.tar.bz2
Move settings.coffee from background_scripts/ to lib/
Diffstat (limited to 'tests/unit_tests')
-rw-r--r--tests/unit_tests/exclusion_test.coffee2
-rw-r--r--tests/unit_tests/settings_test.coffee2
-rw-r--r--tests/unit_tests/utils_test.coffee2
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/unit_tests/exclusion_test.coffee b/tests/unit_tests/exclusion_test.coffee
index 097e1f30..28c17a2f 100644
--- a/tests/unit_tests/exclusion_test.coffee
+++ b/tests/unit_tests/exclusion_test.coffee
@@ -14,7 +14,7 @@ root.Marks =
extend(global, require "../../lib/utils.js")
Utils.getCurrentVersion = -> '1.44'
-extend(global,require "../../background_scripts/settings.js")
+extend(global,require "../../lib/settings.js")
Settings.init()
extend(global, require "../../background_scripts/exclusions.js")
extend(global, require "../../background_scripts/commands.js")
diff --git a/tests/unit_tests/settings_test.coffee b/tests/unit_tests/settings_test.coffee
index b44a904f..946a1688 100644
--- a/tests/unit_tests/settings_test.coffee
+++ b/tests/unit_tests/settings_test.coffee
@@ -4,7 +4,7 @@ extend global, require "./test_chrome_stubs.js"
extend(global, require "../../lib/utils.js")
Utils.getCurrentVersion = -> '1.44'
global.localStorage = {}
-extend(global,require "../../background_scripts/settings.js")
+extend(global,require "../../lib/settings.js")
context "settings",
diff --git a/tests/unit_tests/utils_test.coffee b/tests/unit_tests/utils_test.coffee
index 283f0ca0..f9ed3636 100644
--- a/tests/unit_tests/utils_test.coffee
+++ b/tests/unit_tests/utils_test.coffee
@@ -2,7 +2,7 @@ require "./test_helper.js"
extend global, require "./test_chrome_stubs.js"
extend(global, require "../../lib/utils.js")
Utils.getCurrentVersion = -> '1.43'
-extend(global, require "../../background_scripts/settings.js")
+extend(global, require "../../lib/settings.js")
Settings.init()
context "isUrl",