diff options
author | Trevor Elliott <trevor@galois.com> | 2013-06-03 15:12:31 -0700 |
---|---|---|
committer | Trevor Elliott <trevor@galois.com> | 2013-06-03 15:12:31 -0700 |
commit | b2e6343765872d981122b358afd76d81403c4240 (patch) | |
tree | 3e235fdd1f84ce9de1639fc2424d5cf1d4ee01d1 /contexts | |
parent | c555ff24d184947ab8e0df07b1e57f8b0d7dc2fd (diff) |
Bring the test suite back up to date
Diffstat (limited to 'contexts')
-rw-r--r-- | contexts/data/fiveui/settings.js | 1 | ||||
-rw-r--r-- | contexts/data/tests/SpecRunner.html | 6 | ||||
-rw-r--r-- | contexts/data/tests/specs/rules.js | 6 | ||||
-rw-r--r-- | contexts/data/tests/specs/settings.js | 2 |
4 files changed, 7 insertions, 8 deletions
diff --git a/contexts/data/fiveui/settings.js b/contexts/data/fiveui/settings.js index b965169..4154158 100644 --- a/contexts/data/fiveui/settings.js +++ b/contexts/data/fiveui/settings.js @@ -33,7 +33,6 @@ fiveui.Settings = function(store) { this.store = store; }; -_.extend(fiveui.Settings.prototype, Backbone.Events); _.extend(fiveui.Settings.prototype, { /** diff --git a/contexts/data/tests/SpecRunner.html b/contexts/data/tests/SpecRunner.html index 538309c..4a7ec8c 100644 --- a/contexts/data/tests/SpecRunner.html +++ b/contexts/data/tests/SpecRunner.html @@ -12,9 +12,8 @@ <script type="text/javascript" src="../lib/jasmine/boot.js"></script> <script type="text/javascript" src="../lib/jquery/jquery-1.8.3.js"></script> - <script type="text/javascript" src="../lib/jquery/jquery.json-2.4.js"></script> - <script type="text/javascript" src="../lib/underscore/underscore.js"></script> - <script type="text/javascript" src="../lib/backbone/backbone.js"></script> + <script type="text/javascript" src="../lib/underscore.js"></script> + <script type="text/javascript" src="../lib/backbone.js"></script> <script type="text/javascript" src="mock-storage.js"></script> <script type="text/javascript" src="../fiveui/set.js"></script> @@ -22,6 +21,7 @@ <script type="text/javascript" src="../fiveui/chan.js"></script> <script type="text/javascript" src="../fiveui/rules.js"></script> <script type="text/javascript" src="../fiveui/messenger.js"></script> + <script type="text/javascript" src="../fiveui/url-pat.js"></script> <script type="text/javascript" src="../fiveui/settings.js"></script> <script type="text/javascript" src="../fiveui/state.js"></script> <script type="text/javascript" src="../fiveui/injected/prelude.js"></script> diff --git a/contexts/data/tests/specs/rules.js b/contexts/data/tests/specs/rules.js index 0cde19e..b9db6b3 100644 --- a/contexts/data/tests/specs/rules.js +++ b/contexts/data/tests/specs/rules.js @@ -7,7 +7,7 @@ describe('fiveui.Rules', function() { 'see: http://test.description/', 'function() { console.log("fail"); }'); - var jsonRule = jQuery.toJSON(ruleIn); + var jsonRule = JSON.stringify(ruleIn); var ruleOut = fiveui.Rule.fromJSON(JSON.parse(jsonRule)); @@ -30,7 +30,7 @@ describe('fiveui.RuleSet', function() { var ruleSet = new fiveui.RuleSet(42, 'rule set', 'desc', '', [rule1, rule2]); - var jsonSet = jQuery.toJSON(ruleSet); + var jsonSet = JSON.stringify(ruleSet); var restoredSet = fiveui.RuleSet.fromJSON(42, JSON.parse(jsonSet)); expect(restoredSet.id).toBe(ruleSet.id); @@ -51,7 +51,7 @@ describe('fiveui.RuleSet', function() { var ruleSet = new fiveui.RuleSet(42, 'rule set', 'desc', [rule1, rule2], '', ['dep1.js', 'dep2.js']); - var jsonSet = jQuery.toJSON(ruleSet); + var jsonSet = JSON.stringify(ruleSet); var restoredSet = fiveui.RuleSet.fromJSON(42, JSON.parse(jsonSet)); expect(restoredSet.id).toBe(ruleSet.id); diff --git a/contexts/data/tests/specs/settings.js b/contexts/data/tests/specs/settings.js index 6e206cf..a89b532 100644 --- a/contexts/data/tests/specs/settings.js +++ b/contexts/data/tests/specs/settings.js @@ -35,7 +35,7 @@ describe('fiveui.Settings', function() { var result = settings.getUrlPat(urlId); expect(result.regex).toBe(urlPat); - expect(result.id).toBe(urlId); + expect(result.rule_id).toBe(ruleId); }); it('matches urls when there\s a valid pattern registered', function() { |