From e5e609a90795457f9fea2ea4dd085af7a9828a2d Mon Sep 17 00:00:00 2001
From: Jonathan Abbett <jonathan@act.md>
Date: Fri, 18 Oct 2019 14:16:54 -0400
Subject: [PATCH] Resolves #26, a bug for Turbolinks users

---
 Gemfile                                          | 4 ++++
 app/views/application/_abraham.html.erb          | 2 +-
 lib/abraham/version.rb                           | 2 +-
 test/dummy/app/assets/javascripts/application.js | 1 +
 test/dummy/app/views/dashboard/home.html.erb     | 2 ++
 test/dummy/test/system/tours_test.rb             | 8 ++++++++
 6 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index 7d3fd4b..584147a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -32,6 +32,10 @@ gemspec
 # To use a debugger
 # gem 'byebug', group: [:development, :test]
 
+group :development, :test do
+  gem 'turbolinks'
+end
+
 group :test do
   # Adds support for Capybara system testing and selenium driver
   gem 'capybara', '>= 2.15'
diff --git a/app/views/application/_abraham.html.erb b/app/views/application/_abraham.html.erb
index c95bd0a..ffec748 100644
--- a/app/views/application/_abraham.html.erb
+++ b/app/views/application/_abraham.html.erb
@@ -1,5 +1,5 @@
 <script>
-  const tour = new Shepherd.Tour(<%= Rails.configuration.abraham.tour_options.html_safe unless Rails.configuration.abraham.tour_options.nil? %>);
+  var tour = new Shepherd.Tour(<%= Rails.configuration.abraham.tour_options.html_safe unless Rails.configuration.abraham.tour_options.nil? %>);
 
   tour.on("complete", function() {
     // ajax
diff --git a/lib/abraham/version.rb b/lib/abraham/version.rb
index e17c8fd..5bc82dc 100644
--- a/lib/abraham/version.rb
+++ b/lib/abraham/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Abraham
-  VERSION = "2.0.0"
+  VERSION = "2.0.2"
 end
diff --git a/test/dummy/app/assets/javascripts/application.js b/test/dummy/app/assets/javascripts/application.js
index 5c68c7d..c709793 100644
--- a/test/dummy/app/assets/javascripts/application.js
+++ b/test/dummy/app/assets/javascripts/application.js
@@ -10,5 +10,6 @@
 // Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
 // about supported directives.
 //
+//= require turbolinks
 //= require abraham
 //= require_tree .
diff --git a/test/dummy/app/views/dashboard/home.html.erb b/test/dummy/app/views/dashboard/home.html.erb
index c04268d..5f9c7ec 100644
--- a/test/dummy/app/views/dashboard/home.html.erb
+++ b/test/dummy/app/views/dashboard/home.html.erb
@@ -4,3 +4,5 @@
 <div class="notice-me" style="width:300px;height:300px;background-color:whitesmoke;">
     a content element to notice
 </div>
+
+<%= link_to "Other Page", dashboard_other_url %>
\ No newline at end of file
diff --git a/test/dummy/test/system/tours_test.rb b/test/dummy/test/system/tours_test.rb
index cca0397..f96c476 100644
--- a/test/dummy/test/system/tours_test.rb
+++ b/test/dummy/test/system/tours_test.rb
@@ -63,4 +63,12 @@ class ToursTest < ApplicationSystemTestCase
     visit dashboard_home_url
     assert_selector ".shepherd-element", visible: true
   end
+
+  test "navigate with turbolinks between pages with tours" do
+    visit dashboard_home_url
+    assert_selector ".shepherd-element", visible: true
+    # Navigate to other page
+    find("a").click
+    assert_selector ".shepherd-element", visible: true
+  end
 end