From 6780a16ce90b33512e038887956be8e8aeb4523f Mon Sep 17 00:00:00 2001 From: Simon Baird Date: Wed, 29 Jan 2014 02:04:35 +1000 Subject: [PATCH 1/2] Add Simon Baird to Contributor Licence Agreement --- licenses/cla-individual.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/licenses/cla-individual.md b/licenses/cla-individual.md index 0dac6c5d2..3ce0d0296 100644 --- a/licenses/cla-individual.md +++ b/licenses/cla-individual.md @@ -132,3 +132,5 @@ João Bolila, @jbolila, 2014/01/05 Chris Sugden, @csugden, 2014/01/13 Jeffrey Wilkinson, @buggyj, 2014/01/10 + +Simon Baird, @simonbaird, 2014/01/29 From 848722165475511e435e238be1f652169a321a5e Mon Sep 17 00:00:00 2001 From: Simon Baird Date: Thu, 30 Jan 2014 16:11:54 +1000 Subject: [PATCH 2/2] Fix timezone related sameday filter test failure In certain timezones, 201304151312 UTC is not actually the same day as 201304152219 any 201304151756. This was causing the test for the 'sameday' filter operator to fail. (I'm in GMT+10). This is a quick-fix. I've just adjusted the timestamps to be close together so they will be same day no matter what timezone you're in. --- editions/test/tiddlers/tests/test-filters.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/editions/test/tiddlers/tests/test-filters.js b/editions/test/tiddlers/tests/test-filters.js index 0eb940dce..b2532d515 100644 --- a/editions/test/tiddlers/tests/test-filters.js +++ b/editions/test/tiddlers/tests/test-filters.js @@ -29,13 +29,13 @@ describe("Filter tests", function() { text: "The quick brown fox in $:/TiddlerTwo", tags: ["one"], modifier: "JoeBloggs", - modified: "201304152219"}); + modified: "201304152222"}); wiki.addTiddler({ title: "$:/TiddlerTwo", text: "The rain in Spain\nfalls mainly on the plain and [[a fourth tiddler]]", tags: ["two"], modifier: "JohnDoe", - modified: "201304151756"}); + modified: "201304152211"}); wiki.addTiddler({ title: "Tiddler Three", text: "The speed of sound in light\n\nThere is no TiddlerZero but TiddlerSix", @@ -206,7 +206,7 @@ describe("Filter tests", function() { }); it("should handle the sameday operator", function() { - expect(wiki.filterTiddlers("[sameday[201304151312]sort[title]]").join(",")).toBe("$:/TiddlerTwo,TiddlerOne"); + expect(wiki.filterTiddlers("[sameday[201304152200]sort[title]]").join(",")).toBe("$:/TiddlerTwo,TiddlerOne"); }); describe("testing the is operator",function() {