From 9960e8f01ab8477151465af936d7cb14b84fb125 Mon Sep 17 00:00:00 2001
From: mrmr1993
Date: Mon, 27 Apr 2015 16:21:38 +0100
Subject: Combine sync.coffee with settings.coffee

---
 tests/unit_tests/exclusion_test.coffee | 1 -
 tests/unit_tests/settings_test.coffee  | 1 -
 tests/unit_tests/utils_test.coffee     | 1 -
 3 files changed, 3 deletions(-)

(limited to 'tests')

diff --git a/tests/unit_tests/exclusion_test.coffee b/tests/unit_tests/exclusion_test.coffee
index b3ed7194..217f2309 100644
--- a/tests/unit_tests/exclusion_test.coffee
+++ b/tests/unit_tests/exclusion_test.coffee
@@ -14,7 +14,6 @@ root.Marks =
 
 extend(global, require "../../lib/utils.js")
 Utils.getCurrentVersion = -> '1.44'
-extend(global,require "../../background_scripts/sync.js")
 extend(global,require "../../background_scripts/settings.js")
 Sync.init()
 extend(global, require "../../background_scripts/exclusions.js")
diff --git a/tests/unit_tests/settings_test.coffee b/tests/unit_tests/settings_test.coffee
index 4cd20211..e85c45f2 100644
--- a/tests/unit_tests/settings_test.coffee
+++ b/tests/unit_tests/settings_test.coffee
@@ -4,7 +4,6 @@ extend global, require "./test_chrome_stubs.js"
 extend(global, require "../../lib/utils.js")
 Utils.getCurrentVersion = -> '1.44'
 global.localStorage = {}
-extend(global,require "../../background_scripts/sync.js")
 extend(global,require "../../background_scripts/settings.js")
 Sync.init()
 
diff --git a/tests/unit_tests/utils_test.coffee b/tests/unit_tests/utils_test.coffee
index bfe066c3..e7febe13 100644
--- a/tests/unit_tests/utils_test.coffee
+++ b/tests/unit_tests/utils_test.coffee
@@ -2,7 +2,6 @@ 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/sync.js")
 extend(global, require "../../background_scripts/settings.js")
 Sync.init()
 
-- 
cgit v1.2.3