Fix failing tests

3 files changed, 24 insertions, 72 deletions

diff --git a/src/js/tests/specs/messenger.js b/src/js/tests/specs/messenger.js
index 12bd9e1..3e236fa 100644
--- a/src/js/tests/specs/messenger.js
+++ b/src/js/tests/specs/messenger.js
@@ -72,25 +72,4 @@ describe('fiveui.Messenger', function() {
     expect(m1got[0]).toBe(null);
   });
 
-
-  it('is able to send rules', function() {
-    var ruleIn = new fiveui.Rule(42, 'testRule',
-        'see: http://test.description/',
-        'function() { console.log("fail"); }');
-
-    var got = [];
-    m1.register('rule', function(r){
-      got.push(r);
-    });
-
-    m2.send('rule', ruleIn);
-    expect(got.length).toBe(1);
-
-    var ruleOut = got[0];
-    expect(ruleIn.id).toBe(ruleOut.id);
-    expect(ruleIn.name).toBe(ruleOut.name);
-    expect(ruleIn.description).toBe(ruleOut.description);
-    expect(ruleIn.ruleStr).toBe(ruleOut.ruleStr);
-  });
-
 });
diff --git a/src/js/tests/specs/rules.js b/src/js/tests/specs/rules.js
index b9db6b3..518cfc9 100644
--- a/src/js/tests/specs/rules.js
+++ b/src/js/tests/specs/rules.js
@@ -3,9 +3,11 @@ describe('fiveui.Rules', function() {
 
   it('round trips via JSON', function() {
 
-    var ruleIn = new fiveui.Rule(42, 'testRule',
-        'see: http://test.description/',
-        'function() { console.log("fail"); }');
+    var ruleIn = new fiveui.Rule({
+      id:          42,
+      name:        'testRule',
+      description: 'see: http://test.description/',
+    });
 
     var jsonRule = JSON.stringify(ruleIn);
 
@@ -14,7 +16,6 @@ describe('fiveui.Rules', function() {
     expect(ruleOut.id).toBe(ruleIn.id);
     expect(ruleOut.name).toBe(ruleIn.name);
     expect(ruleOut.description).toBe(ruleIn.description);
-    expect(ruleOut.ruleStr).toBe(ruleIn.ruleStr);
   });
 
 
@@ -25,10 +26,11 @@ describe('fiveui.RuleSet', function() {
 
   it('round trips via JSON, without deps', function() {
 
-    var rule1 = new fiveui.Rule(42, 'r1', 'desc1', 'rule txt1');
-    var rule2 = new fiveui.Rule(43, 'r2', 'desc2', 'rule txt2');
-
-    var ruleSet = new fiveui.RuleSet(42, 'rule set', 'desc', '', [rule1, rule2]);
+    var ruleSet = new fiveui.RuleSet({
+      id: 42,
+      name: 'rule set',
+      description: 'desc'
+    });
 
     var jsonSet     = JSON.stringify(ruleSet);
     var restoredSet = fiveui.RuleSet.fromJSON(42, JSON.parse(jsonSet));
@@ -45,11 +47,11 @@ describe('fiveui.RuleSet', function() {
 
   it('round trips via JSON, with deps', function() {
 
-    var rule1 = new fiveui.Rule(42, 'r1', 'desc1', 'rule txt1');
-    var rule2 = new fiveui.Rule(43, 'r2', 'desc2', 'rule txt2');
-
-    var ruleSet = new fiveui.RuleSet(42, 'rule set', 'desc', [rule1, rule2],
-        '', ['dep1.js', 'dep2.js']);
+    var ruleSet = new fiveui.RuleSet({
+      id:          42,
+      name:        'rule set',
+      description: 'desc', [rule1, rule2],
+    });
 
     var jsonSet     = JSON.stringify(ruleSet);
     var restoredSet = fiveui.RuleSet.fromJSON(42, JSON.parse(jsonSet));
diff --git a/src/js/tests/specs/settings.js b/src/js/tests/specs/settings.js
index a89b532..088b94d 100644
--- a/src/js/tests/specs/settings.js
+++ b/src/js/tests/specs/settings.js
@@ -27,61 +27,32 @@ describe('fiveui.Settings', function() {
     expect(settings.get(key)).toEqual(value);
   });
 
-  it('round trips rules through addUrl', function() {
-    // somewhat random rule id
-    var ruleId = Math.floor(Math.random() * 101);
-    var urlPat = 'http://.*';
-    var urlId  = settings.addUrl(urlPat, ruleId);
-    var result = settings.getUrlPat(urlId);
-
-    expect(result.regex).toBe(urlPat);
-    expect(result.rule_id).toBe(ruleId);
-  });
-
   it('matches urls when there\s a valid pattern registered', function() {
-    var newId = 42;
-    settings.addUrl('http://.*', newId);
-    expect(settings.checkUrl('http://foo').rule_id).toBe(newId);
+    var rset = new fiveui.RuleSet({ patterns: ['http://.*'] });
+    settings.addRuleSet(rset);
+    expect(settings.checkUrl('http://foo').id).toBe(0);
   });
 
   it('doesn\'t match urls when there are no patterns registered', function() {
-    expect(settings.checkUrl('http://foo')).toBe(null);
+    expect(settings.checkUrl('http://foo')).toBe(undefined);
   });
 
   it('removes rules successfully', function() {
-    var obj = {
-      id:          17,
+    var rsId = settings.addRuleSet(new fiveui.RuleSet({
       name:        'rs',
       description: '',
       rules:       []
-    };
-
-    var rs = settings.addRuleSet(obj);
+    }));
     expect(rs).not.toBe(null);
 
     var rsCount1 = settings.getRuleSets().length;
-    settings.remRuleSet(rs.id);
+    settings.remRuleSet(rsId);
+
     var rsCount2 = settings.getRuleSets().length;
     expect(rsCount1).toEqual(rsCount2 + 1);
 
-    rs = settings.getRuleSet(rs.id);
+    var rs = settings.getRuleSet(rsId);
     expect(rs).toBe(null);
   });
 
-  it('is unable to remove rules that are in use', function() {
-    var obj = {
-      id:          17,
-      name:        'rs',
-      description: '',
-      rules:       []
-    };
-
-    var rs = settings.addRuleSet(obj);
-    expect(rs).not.toBe(null);
-
-    var urlPatId = settings.addUrl('*', rs.id);
-    rs = settings.getRuleSet(rs.id);
-    expect(rs).not.toBe(null);
-  });
-
 });