Merge pull request #26 from codecraft/pulls/reset-to-first-question

Updated reset to go to the first question
codecraft · Oct 28, 2020 · f97b373 · f97b373
2 parents f6cd6b2 + 46b6dd2
commit f97b373
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 15 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,10 +8,8 @@ env:
 
 matrix:
   include:
-    - php: 7.0
-      env: DB=MYSQL RECIPE_VERSION=4.3.6 PHPUNIT_COVERAGE_TEST=1
     - php: 7.1
-      env: DB=MYSQL RECIPE_VERSION=4.3.6 PHPUNIT_TEST=1
+      env: DB=MYSQL RECIPE_VERSION=4.3.6 PHPUNIT_COVERAGE_TEST=1
     - php: 7.2
       env: DB=MYSQL RECIPE_VERSION=4.4.7 PHPUNIT_TEST=1
     - php: 7.3

diff --git a/src/Control/PathfinderRequestHandler.php b/src/Control/PathfinderRequestHandler.php
@@ -505,7 +505,7 @@ public function getResults()
         $selfExcludedIds = SiteTree::get()->filter(['HideFromPathfinders' => true])->column();
         $excludePageIds = $this->ExcludedPages()->column();
         $excludeIds = array_merge($excludePageIds, $selfExcludedIds);
-        
+
         if ($this->data()->getPage()) {
             // Also exclude the Pathfinder's page
             $excludeIds[] = $this->data()->getPage()->ID;
@@ -544,14 +544,34 @@ public function Link($action = null)
      * @return string
      */
     public function getStartLink()
+    {
+        if (!$this->Questions()->count()) {
+            return $this->Link('?questions-missing=1');
+        }
+
+        return $this->Link('start');
+    }
+
+    /**
+     * @return string
+     */
+    public function getResetLink()
+    {
+        return $this->Link('reset');
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getFirstQuestionLink()
     {
         $questions = $this->Questions();
 
         if (!$questions->count()) {
-            return $this->Link('?questions-missing=1');
+            return null;
         }
 
-        return $this->Link(sprintf('start'));
+        return $this->Link(sprintf('question?id=%s&step=1', $questions->first()->ID));
     }
 
     /**
@@ -639,17 +659,20 @@ public function index()
      */
     public function start()
     {
-        $link = $this->Link(sprintf('question?id=%s&step=1', $this->Questions()->first()->ID));
-
-        return $this->clearAll()->redirect($this->getStore()->augmentURL($link));
+        // Take the user to the first question
+        return $this->clearAll()->redirect($this->getStore()->augmentURL($this->getFirstQuestionLink()));
     }
 
     /**
      * @return HTTPResponse
      */
     public function reset()
     {
-        return $this->clearAll()->redirect($this->getStore()->augmentURL($this->getController()->Link()));
+        // Clear the store
+        $this->getStore()->clear();
+
+        // Take the user to the first question
+        return $this->clearAll()->redirect($this->getStore()->augmentURL($this->getFirstQuestionLink()));
     }
 
     /**

diff --git a/src/Model/Pathfinder.php b/src/Model/Pathfinder.php
@@ -119,10 +119,7 @@ public static function reset_link($arguments, $content = null)
 
         return sprintf(
             '<a href="%s" title="%s">%s</a>',
-            $page->Link(Controller::join_links(
-                PathfinderPageController::config()->get('pathfinder_url_segment'),
-                'pathfinder/reset'
-            )),
+            $page->Pathfinder()->getRequestHandler()->getResetLink(),
             $content,
             $content
         );

diff --git a/tests/units/PathfinderTest.php b/tests/units/PathfinderTest.php
@@ -40,7 +40,7 @@ public function testResetLinkShortCode()
 
         $this->assertSame(
             Pathfinder::reset_link([], 'Start again'),
-            '<a href="/pathfinder-page/pathfinder/reset" title="Start again">Start again</a>',
+            '<a href="/pathfinder-page/pathfinder/reset/" title="Start again">Start again</a>',
             'Reset link should produce expected link attributes and content'
         );
     }