Merge pull request #812 from alphagov/fix-bug-introduced-in-survey-re…

…factor Fix transaction bug introduced in 8f1f835
alphagov · Jul 22, 2016 · 1463f8d · 1463f8d
2 parents 05c2625 + 9558145
commit 1463f8d
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 5 deletions.
diff --git a/app/assets/javascripts/surveys.js b/app/assets/javascripts/surveys.js
@@ -106,15 +106,15 @@
     },
 
     userCompletedTransaction: function() {
-      var currentURL = window.location.pathname;
+      var path = userSurveys.currentPath();
 
       function stringContains(str, substr) {
         return str.indexOf(substr) > -1;
       }
 
-      if (stringContains(currentURL, "/done") &&
-          stringContains(currentURL, "/transaction-finished") &&
-          stringContains(currentURL, "/driving-transaction-finished")) {
+      if (stringContains(path, "/done") ||
+          stringContains(path, "/transaction-finished") ||
+          stringContains(path, "/driving-transaction-finished")) {
             return true;
       }
     },
@@ -147,7 +147,8 @@
       return "govuk_" + cookieStub;
     },
 
-    currentTime: function() { return new Date().getTime(); }
+    currentTime: function() { return new Date().getTime(); },
+    currentPath: function() { return window.location.pathname; }
   };
 
   root.GOVUK.userSurveys = userSurveys;

diff --git a/spec/javascripts/surveys-spec.js b/spec/javascripts/surveys-spec.js
@@ -99,6 +99,28 @@ describe("Surveys", function() {
     });
   });
 
+  describe("userCompletedTransaction", function() {
+    it("normally returns false", function() {
+      spyOn(surveys, 'currentPath').and.returnValue('/');
+      expect(surveys.userCompletedTransaction()).toBeFalsy();
+    });
+
+    it("returns true when /done", function() {
+      spyOn(surveys, 'currentPath').and.returnValue('/done');
+      expect(surveys.userCompletedTransaction()).toBeTruthy();
+    });
+
+    it("returns true when /transaction-finished", function() {
+      spyOn(surveys, 'currentPath').and.returnValue('/transaction-finished');
+      expect(surveys.userCompletedTransaction()).toBeTruthy();
+    });
+
+    it("returns true when /driving-transaction-finished", function() {
+      spyOn(surveys, 'currentPath').and.returnValue('/driving-transaction-finished');
+      expect(surveys.userCompletedTransaction()).toBeTruthy();
+    });
+  });
+
   describe("Event handlers", function () {
       beforeEach(function() {
         surveys.displaySurvey(defaultSurvey);