Merge pull request #723 from alphagov/temporary-survey

Run survey between 2016/02/01 and 2016/05/01
alphagov · Jan 29, 2016 · 1a5a59d · 1a5a59d
2 parents e6425e4 + 21b161f
commit 1a5a59d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/app/assets/javascripts/user-satisfaction-survey.js b/app/assets/javascripts/user-satisfaction-survey.js
@@ -67,8 +67,8 @@
     setSurveyUrl: function(href) {
       var $surveyLink = $('#take-survey');
       var surveyUrl = $('#user-satisfaction-survey-container').data('survey-url');
-      var surveyStarts = new Date("January 26, 2016").getTime();
-      var surveyEnds = new Date("January 27, 2016 23:59:59").getTime();
+      var surveyStarts = new Date("February 1, 2016").getTime();
+      var surveyEnds = new Date("May 1, 2016 23:59:59").getTime();
 
       if (userSatisfaction.currentDate() >= surveyStarts &&
           userSatisfaction.currentDate() <= surveyEnds) {
@@ -81,7 +81,7 @@
 
       $surveyLink.attr('href', surveyUrl);
     },
-    currentDate: function() { new Date().getTime(); }
+    currentDate: function() { return new Date().getTime(); }
   };
 
   root.GOVUK.userSatisfaction = userSatisfaction;

diff --git a/spec/javascripts/user-satisfaction-survey-spec.js b/spec/javascripts/user-satisfaction-survey-spec.js
@@ -33,14 +33,18 @@ describe("User Satisfaction Survey", function () {
       expect($('#user-satisfaction-survey').attr('aria-hidden')).toBe('false');
     });
 
-    it("uses the temporary survey URL on 26/01/2016", function() {
-      spyOn(survey, 'currentDate').and.returnValue(new Date("January 26, 2016").getTime());
+    it("actually returns a value from `currentDate`", function() {
+      expect(survey.currentDate()).not.toBe(undefined);
+    });
+
+    it("uses the temporary survey URL on 01/02/2016", function() {
+      spyOn(survey, 'currentDate').and.returnValue(new Date("February 1, 2016").getTime());
       survey.showSurveyBar();
       expect($('#take-survey').attr('href')).toMatch("https://www.surveymonkey.co.uk/r/2MRDLTW?");
     });
 
-    it("uses the temporary survey URL on 27/01/2016", function() {
-      spyOn(survey, 'currentDate').and.returnValue(new Date("January 27, 2016 12:15:30").getTime());
+    it("uses the temporary survey URL on 01/05/2016", function() {
+      spyOn(survey, 'currentDate').and.returnValue(new Date("May 1, 2016 12:15:30").getTime());
       survey.showSurveyBar();
       expect($('#take-survey').attr('href')).toMatch("https://www.surveymonkey.co.uk/r/2MRDLTW?");
     });