aboutsummaryrefslogtreecommitdiff
path: root/src/js/tests/specs/settings.js
diff options
context:
space:
mode:
authorGravatar Rogan Creswick <creswick@gmail.com>2013-12-17 11:25:09 -0800
committerGravatar Rogan Creswick <creswick@gmail.com>2013-12-17 11:25:09 -0800
commit814e6f5e2125a48578d8fa47d06d1d3fb92ef984 (patch)
tree596039fd73dbfd489558d6b6538ebfc41786f332 /src/js/tests/specs/settings.js
parentaac09743ba9990f0d8a3b0cdcd08acab454062e6 (diff)
parent3f86fd756a146bab5386503dfb2ca11c46f30352 (diff)
Merge pull request #22 from GaloisInc/promises
Modifies fiveui.RuleSet.load to return promises
Diffstat (limited to 'src/js/tests/specs/settings.js')
-rw-r--r--src/js/tests/specs/settings.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/js/tests/specs/settings.js b/src/js/tests/specs/settings.js
index 088b94d..19eb556 100644
--- a/src/js/tests/specs/settings.js
+++ b/src/js/tests/specs/settings.js
@@ -27,7 +27,7 @@ describe('fiveui.Settings', function() {
expect(settings.get(key)).toEqual(value);
});
- it('matches urls when there\s a valid pattern registered', function() {
+ it('matches urls when there\'s a valid pattern registered', function() {
var rset = new fiveui.RuleSet({ patterns: ['http://.*'] });
settings.addRuleSet(rset);
expect(settings.checkUrl('http://foo').id).toBe(0);