From be17ba31922c57e9183660d5c5f61b535e983e5d Mon Sep 17 00:00:00 2001
From: Pascal Zumkehr <spam@codez.ch>
Date: Sat, 18 Nov 2023 16:51:29 +0100
Subject: [PATCH] Replace rails ujs with turbo

---
 Gemfile                                       |  1 +
 Rakefile                                      | 48 ++++++++-----------
 app/assets/stylesheets/sample.scss            |  2 +-
 app/helpers/actions_helper.rb                 |  6 +--
 app/helpers/dry_crud/table/actions.rb         |  6 +--
 app/views/shared/_error_messages.html.erb     |  4 +-
 .../controllers/admin/cities_controller.rb    |  2 +-
 .../controllers/admin/countries_controller.rb |  2 +-
 .../app/controllers/people_controller.rb      |  2 +-
 ...ajax_controller.rb => turbo_controller.rb} |  6 +--
 .../app/views/admin/cities/_form.html.erb     |  3 +-
 .../app/views/admin/cities/_form.html.haml    |  3 +-
 .../app/views/ajax/_actions_show.html.erb     |  7 ---
 .../app/views/ajax/_actions_show.html.haml    |  7 ---
 test/templates/app/views/ajax/_form.html.erb  |  2 -
 test/templates/app/views/ajax/_form.html.haml |  2 -
 test/templates/app/views/ajax/_hello.html.erb |  1 -
 .../templates/app/views/ajax/_hello.html.haml |  1 -
 test/templates/app/views/ajax/ajax.js.erb     |  1 -
 test/templates/app/views/ajax/ajax.js.haml    |  1 -
 test/templates/app/views/ajax/edit.js.erb     |  1 -
 test/templates/app/views/ajax/edit.js.haml    |  1 -
 test/templates/app/views/ajax/show.js.erb     |  1 -
 test/templates/app/views/ajax/show.js.haml    |  1 -
 test/templates/app/views/ajax/update.js.erb   |  5 --
 test/templates/app/views/ajax/update.js.haml  |  5 --
 .../{ajax => turbo}/_actions_index.html.erb   |  6 +--
 .../{ajax => turbo}/_actions_index.html.haml  |  6 +--
 .../app/views/turbo/_actions_show.html.erb    |  7 +++
 .../app/views/turbo/_actions_show.html.haml   |  7 +++
 .../templates/app/views/turbo/_hello.html.erb |  1 +
 .../app/views/turbo/_hello.html.haml          |  1 +
 .../app/views/turbo/edit.turbo_stream.erb     |  1 +
 .../app/views/turbo/edit.turbo_stream.haml    |  1 +
 .../app/views/turbo/show.turbo_stream.erb     |  1 +
 .../app/views/turbo/show.turbo_stream.haml    |  1 +
 .../app/views/turbo/turbo.turbo_stream.erb    |  1 +
 .../app/views/turbo/turbo.turbo_stream.haml   |  1 +
 .../app/views/turbo/update.turbo_stream.erb   |  1 +
 .../app/views/turbo/update.turbo_stream.haml  |  1 +
 test/templates/config/locales/cities.en.yml   | 12 ++---
 test/templates/config/routes.rb               |  6 +--
 .../controllers/people_controller_spec.rb     | 14 +++---
 .../controllers/people_controller_test.rb     | 22 ++++-----
 44 files changed, 94 insertions(+), 117 deletions(-)
 rename test/templates/app/controllers/{ajax_controller.rb => turbo_controller.rb} (56%)
 delete mode 100644 test/templates/app/views/ajax/_actions_show.html.erb
 delete mode 100644 test/templates/app/views/ajax/_actions_show.html.haml
 delete mode 100644 test/templates/app/views/ajax/_form.html.erb
 delete mode 100644 test/templates/app/views/ajax/_form.html.haml
 delete mode 100644 test/templates/app/views/ajax/_hello.html.erb
 delete mode 100644 test/templates/app/views/ajax/_hello.html.haml
 delete mode 100644 test/templates/app/views/ajax/ajax.js.erb
 delete mode 100644 test/templates/app/views/ajax/ajax.js.haml
 delete mode 100644 test/templates/app/views/ajax/edit.js.erb
 delete mode 100644 test/templates/app/views/ajax/edit.js.haml
 delete mode 100644 test/templates/app/views/ajax/show.js.erb
 delete mode 100644 test/templates/app/views/ajax/show.js.haml
 delete mode 100644 test/templates/app/views/ajax/update.js.erb
 delete mode 100644 test/templates/app/views/ajax/update.js.haml
 rename test/templates/app/views/{ajax => turbo}/_actions_index.html.erb (60%)
 rename test/templates/app/views/{ajax => turbo}/_actions_index.html.haml (55%)
 create mode 100644 test/templates/app/views/turbo/_actions_show.html.erb
 create mode 100644 test/templates/app/views/turbo/_actions_show.html.haml
 create mode 100644 test/templates/app/views/turbo/_hello.html.erb
 create mode 100644 test/templates/app/views/turbo/_hello.html.haml
 create mode 100644 test/templates/app/views/turbo/edit.turbo_stream.erb
 create mode 100644 test/templates/app/views/turbo/edit.turbo_stream.haml
 create mode 100644 test/templates/app/views/turbo/show.turbo_stream.erb
 create mode 100644 test/templates/app/views/turbo/show.turbo_stream.haml
 create mode 100644 test/templates/app/views/turbo/turbo.turbo_stream.erb
 create mode 100644 test/templates/app/views/turbo/turbo.turbo_stream.haml
 create mode 100644 test/templates/app/views/turbo/update.turbo_stream.erb
 create mode 100644 test/templates/app/views/turbo/update.turbo_stream.haml

diff --git a/Gemfile b/Gemfile
index a05bb177..5a1f943c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -17,6 +17,7 @@ gem "sprockets-rails"
 gem "jsbundling-rails"
 gem "cssbundling-rails"
 gem "turbo-rails"
+gem "stimulus-rails"
 
 gem 'sassc-rails'
 
diff --git a/Rakefile b/Rakefile
index 41903633..86e60288 100644
--- a/Rakefile
+++ b/Rakefile
@@ -37,12 +37,15 @@ namespace :test do
   end
 
   namespace :app do
-    task :environment do
-      ENV['RAILS_ROOT'] = TEST_APP_ROOT
-      ENV['RAILS_ENV'] = 'test'
 
-      require(File.join(TEST_APP_ROOT, 'config', 'environment'))
-    end
+    desc "Initializes the test application with a couple of classes"
+    task init: [:seed, :customize]
+
+    desc "Customize some of the functionality provided by dry_crud"
+    task customize: ['test:app:add_pagination',
+                     'test:app:use_bootstrap',
+                     'test:app:build_assets'
+                     ]
 
     desc "Create a rails test application"
     task :create do
@@ -53,10 +56,6 @@ namespace :test do
                      File.read(File.join(File.dirname(__FILE__),
                                'test', 'templates', 'Gemfile.append')))
         sh "cd #{TEST_APP_ROOT}; bundle install --local" # update Gemfile.lock
-        #sh "cd #{TEST_APP_ROOT}; bundle binstubs bundler"
-        #sh "cd #{TEST_APP_ROOT}; rails javascript:install:esbuild"
-        #sh "cd #{TEST_APP_ROOT}; yarn add esbuild from \".\""
-        #sh "cd #{TEST_APP_ROOT}; gem install foreman from \".\""
 
         sh "cd #{TEST_APP_ROOT}; rails g rspec:install"
         FileUtils.rm_f(File.join(TEST_APP_ROOT,
@@ -87,6 +86,13 @@ namespace :test do
                            destination_root: TEST_APP_ROOT).invoke_all
     end
 
+    task :environment do
+      ENV['RAILS_ROOT'] = TEST_APP_ROOT
+      ENV['RAILS_ENV'] = 'test'
+
+      require(File.join(TEST_APP_ROOT, 'config', 'environment'))
+    end
+
     desc "Populates the test application with some models and controllers"
     task populate: [:generate_crud] do
       # copy test app templates
@@ -117,15 +123,6 @@ namespace :test do
       end
     end
 
-    desc "Initializes the test application with a couple of classes"
-    task init: [:seed, :customize]
-
-    desc "Customize some of the functionality provided by dry_crud"
-    task customize: ['test:app:add_pagination',
-                     'test:app:add_ujs',
-                     'test:app:use_bootstrap'
-                     ]
-
     desc "Adds pagination to the test app"
     task :add_pagination do
       list_ctrl = File.join(TEST_APP_ROOT,
@@ -145,17 +142,6 @@ namespace :test do
                    "= paginate entries\n\n= render 'list'")
     end
 
-    desc "Adds Rails UJS to the test app"
-    task :add_ujs do
-      sh "cd #{TEST_APP_ROOT}; yarn add @rails/ujs"
-      app_js = File.join(TEST_APP_ROOT, 'app', 'javascript', 'application.js')
-      if File.exist?(app_js) && File.read(app_js) !~ /ujs/
-        file_replace(app_js,
-                      /\n\z/,
-                      "\nimport Rails from '@rails/ujs'\nRails.start()\n")
-      end
-    end
-
     desc "Use Boostrap Icons in the test app"
     task :use_bootstrap do
       sh "cd #{TEST_APP_ROOT}; yarn add bootstrap-icons"
@@ -178,6 +164,10 @@ namespace :test do
                                'app', 'assets', 'stylesheets', 'sample.scss'))
     end
 
+    desc "Build javascript and css in the test app"
+    task :build_assets do
+      sh "cd #{TEST_APP_ROOT}; rails javascript:build css:build"
+    end
   end
 end
 
diff --git a/app/assets/stylesheets/sample.scss b/app/assets/stylesheets/sample.scss
index c67c680a..cf1a995f 100644
--- a/app/assets/stylesheets/sample.scss
+++ b/app/assets/stylesheets/sample.scss
@@ -222,7 +222,7 @@ a.icon img {
 .icon-plus {
   background-image: image-url("actions/add.png");
 }
-.icon-remove {
+.icon-trash {
   background-image: image-url("actions/delete.png");
 }
 .icon-pencil {
diff --git a/app/helpers/actions_helper.rb b/app/helpers/actions_helper.rb
index 163d55e6..d0e4c8e0 100644
--- a/app/helpers/actions_helper.rb
+++ b/app/helpers/actions_helper.rb
@@ -38,9 +38,9 @@ def edit_action_link(path = nil)
   # Uses the current +entry+ if no path is given.
   def destroy_action_link(path = nil)
     path ||= path_args(entry)
-    action_link(ti('link.delete'), 'remove', path,
-                data: { confirm: ti(:confirm_delete),
-                        method: :delete })
+    action_link(ti('link.delete'), 'trash', path,
+                data: { 'turbo-confirm': ti(:confirm_delete),
+                        'turbo-method': :delete })
   end
 
   # Standard list action to the given path.
diff --git a/app/helpers/dry_crud/table/actions.rb b/app/helpers/dry_crud/table/actions.rb
index 3902202c..a812c88b 100644
--- a/app/helpers/dry_crud/table/actions.rb
+++ b/app/helpers/dry_crud/table/actions.rb
@@ -57,11 +57,11 @@ def destroy_action_col(**html_options, &block)
         action_col do |entry|
           path = action_path(entry, &block)
           if path
-            table_action_link('remove',
+            table_action_link('trash',
                               path,
                               **html_options.merge(
-                                data: { confirm: ti(:confirm_delete),
-                                        method: :delete }
+                                data: { 'turbo-confirm': ti(:confirm_delete),
+                                        'turbo-method': :delete }
                               ))
           end
         end
diff --git a/app/views/shared/_error_messages.html.erb b/app/views/shared/_error_messages.html.erb
index 575e82c4..409f20d9 100644
--- a/app/views/shared/_error_messages.html.erb
+++ b/app/views/shared/_error_messages.html.erb
@@ -1,8 +1,8 @@
 <% if errors.any? %>
   <div id='error_explanation' class='alert alert-danger'>
-      <h2>
+      <p>
       <%= ti(:"errors.header", count: errors.count, model: object.to_s) %>
-      </h2>
+      </p>
       <ul>
           <% errors.full_messages.each do |msg| %>
             <li><%= msg %></li>
diff --git a/test/templates/app/controllers/admin/cities_controller.rb b/test/templates/app/controllers/admin/cities_controller.rb
index 70bea86e..49e2dcfc 100644
--- a/test/templates/app/controllers/admin/cities_controller.rb
+++ b/test/templates/app/controllers/admin/cities_controller.rb
@@ -1,6 +1,6 @@
 module Admin
   # Cities Controller nested under /admin and countries
-  class CitiesController < AjaxController
+  class CitiesController < TurboController
     self.nesting = :admin, Country
 
     self.search_columns = :name, 'countries.name'
diff --git a/test/templates/app/controllers/admin/countries_controller.rb b/test/templates/app/controllers/admin/countries_controller.rb
index 7c9ff804..902c7036 100644
--- a/test/templates/app/controllers/admin/countries_controller.rb
+++ b/test/templates/app/controllers/admin/countries_controller.rb
@@ -1,6 +1,6 @@
 module Admin
   # Countries Controller nested under /admin
-  class CountriesController < AjaxController
+  class CountriesController < TurboController
     self.nesting = :admin
 
     self.search_columns = :name, :code
diff --git a/test/templates/app/controllers/people_controller.rb b/test/templates/app/controllers/people_controller.rb
index 349303e7..902e1705 100644
--- a/test/templates/app/controllers/people_controller.rb
+++ b/test/templates/app/controllers/people_controller.rb
@@ -1,5 +1,5 @@
 # People Controller
-class PeopleController < AjaxController
+class PeopleController < TurboController
   self.search_columns = [:name, :email, :remarks, 'cities.name']
 
   self.default_sort = 'people.name, countries.code, cities.name'
diff --git a/test/templates/app/controllers/ajax_controller.rb b/test/templates/app/controllers/turbo_controller.rb
similarity index 56%
rename from test/templates/app/controllers/ajax_controller.rb
rename to test/templates/app/controllers/turbo_controller.rb
index 7d2b809f..03554463 100644
--- a/test/templates/app/controllers/ajax_controller.rb
+++ b/test/templates/app/controllers/turbo_controller.rb
@@ -1,10 +1,10 @@
 # Crud controller responding to js as well
-class AjaxController < CrudController
-  def ajax; end
+class TurboController < CrudController
+  def turbo; end
 
   def update
     super do |format, _success|
-      format.js
+      format.turbo_stream
     end
   end
 end
diff --git a/test/templates/app/views/admin/cities/_form.html.erb b/test/templates/app/views/admin/cities/_form.html.erb
index db8b7c2e..fedad6d6 100644
--- a/test/templates/app/views/admin/cities/_form.html.erb
+++ b/test/templates/app/views/admin/cities/_form.html.erb
@@ -1,5 +1,4 @@
-<% remote ||= false %>
-<%= crud_form remote: remote do |f| %>
+<%= crud_form do |f| %>
   <%= f.labeled(:name, caption: 'Called') do %>
     <%= f.input_field :name %>
   <% end %>
diff --git a/test/templates/app/views/admin/cities/_form.html.haml b/test/templates/app/views/admin/cities/_form.html.haml
index 7b09e0dd..6d03e36a 100644
--- a/test/templates/app/views/admin/cities/_form.html.haml
+++ b/test/templates/app/views/admin/cities/_form.html.haml
@@ -1,5 +1,4 @@
-- remote ||= false
-= crud_form remote: remote do |f|
+= crud_form do |f|
   = f.labeled(:name, caption: 'Called') do
     = f.input_field :name
   = f.labeled_input_field :person_ids, help: 'All people living in this city'
diff --git a/test/templates/app/views/ajax/_actions_show.html.erb b/test/templates/app/views/ajax/_actions_show.html.erb
deleted file mode 100644
index a30ca562..00000000
--- a/test/templates/app/views/ajax/_actions_show.html.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<%= index_action_link %>
-<%= edit_action_link %>
-<%= action_link(ti(:"link.edit") + ' AJAX',
-                'pencil',
-                edit_polymorphic_path(path_args(entry), format: :js),
-                remote: true) %>
-<%= destroy_action_link %>
\ No newline at end of file
diff --git a/test/templates/app/views/ajax/_actions_show.html.haml b/test/templates/app/views/ajax/_actions_show.html.haml
deleted file mode 100644
index 16206274..00000000
--- a/test/templates/app/views/ajax/_actions_show.html.haml
+++ /dev/null
@@ -1,7 +0,0 @@
-= index_action_link
-= edit_action_link
-= action_link(ti(:"link.edit") + ' AJAX',
-              'pencil',
-              edit_polymorphic_path(path_args(entry), format: :js),
-              remote: true)
-= destroy_action_link
\ No newline at end of file
diff --git a/test/templates/app/views/ajax/_form.html.erb b/test/templates/app/views/ajax/_form.html.erb
deleted file mode 100644
index 88cae0f5..00000000
--- a/test/templates/app/views/ajax/_form.html.erb
+++ /dev/null
@@ -1,2 +0,0 @@
-<% remote ||= false %>
-<%= crud_form remote: remote %>
diff --git a/test/templates/app/views/ajax/_form.html.haml b/test/templates/app/views/ajax/_form.html.haml
deleted file mode 100644
index 187d449e..00000000
--- a/test/templates/app/views/ajax/_form.html.haml
+++ /dev/null
@@ -1,2 +0,0 @@
-- remote ||= false
-= crud_form remote: remote
diff --git a/test/templates/app/views/ajax/_hello.html.erb b/test/templates/app/views/ajax/_hello.html.erb
deleted file mode 100644
index 8162ede6..00000000
--- a/test/templates/app/views/ajax/_hello.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-hello from ajax
\ No newline at end of file
diff --git a/test/templates/app/views/ajax/_hello.html.haml b/test/templates/app/views/ajax/_hello.html.haml
deleted file mode 100644
index 8162ede6..00000000
--- a/test/templates/app/views/ajax/_hello.html.haml
+++ /dev/null
@@ -1 +0,0 @@
-hello from ajax
\ No newline at end of file
diff --git a/test/templates/app/views/ajax/ajax.js.erb b/test/templates/app/views/ajax/ajax.js.erb
deleted file mode 100644
index 4ee77cbe..00000000
--- a/test/templates/app/views/ajax/ajax.js.erb
+++ /dev/null
@@ -1 +0,0 @@
-document.getElementById('response').innerHTML = "<%= escape_javascript(render 'hello') %>";
diff --git a/test/templates/app/views/ajax/ajax.js.haml b/test/templates/app/views/ajax/ajax.js.haml
deleted file mode 100644
index cfbf4c41..00000000
--- a/test/templates/app/views/ajax/ajax.js.haml
+++ /dev/null
@@ -1 +0,0 @@
-document.getElementById('response').innerHTML = "#{escape_javascript(render 'hello')}";
diff --git a/test/templates/app/views/ajax/edit.js.erb b/test/templates/app/views/ajax/edit.js.erb
deleted file mode 100644
index 6103154c..00000000
--- a/test/templates/app/views/ajax/edit.js.erb
+++ /dev/null
@@ -1 +0,0 @@
-document.getElementById('content').innerHTML = "<%= escape_javascript(render 'form', remote: true) %>";
diff --git a/test/templates/app/views/ajax/edit.js.haml b/test/templates/app/views/ajax/edit.js.haml
deleted file mode 100644
index 205f777c..00000000
--- a/test/templates/app/views/ajax/edit.js.haml
+++ /dev/null
@@ -1 +0,0 @@
-document.getElementById('content').innerHTML = "#{escape_javascript(render 'form', remote: true)}";
diff --git a/test/templates/app/views/ajax/show.js.erb b/test/templates/app/views/ajax/show.js.erb
deleted file mode 100644
index d3e5ba82..00000000
--- a/test/templates/app/views/ajax/show.js.erb
+++ /dev/null
@@ -1 +0,0 @@
-document.getElementById('content').innerHTML = "<%= escape_javascript(render 'attrs') %>";
diff --git a/test/templates/app/views/ajax/show.js.haml b/test/templates/app/views/ajax/show.js.haml
deleted file mode 100644
index 374aa2b4..00000000
--- a/test/templates/app/views/ajax/show.js.haml
+++ /dev/null
@@ -1 +0,0 @@
-document.getElementById('content').innerHTML = "#{escape_javascript(render 'attrs')}";
diff --git a/test/templates/app/views/ajax/update.js.erb b/test/templates/app/views/ajax/update.js.erb
deleted file mode 100644
index 7568f360..00000000
--- a/test/templates/app/views/ajax/update.js.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<% if entry.errors.present? %>
-  alert('<%= escape_javascript(entry.errors.full_messages.join("\n")) %>');
-<% else %>
-  document.getElementById('content').innerHTML = "<%= escape_javascript(render 'attrs') %>";
-<% end %>
diff --git a/test/templates/app/views/ajax/update.js.haml b/test/templates/app/views/ajax/update.js.haml
deleted file mode 100644
index c641dfd5..00000000
--- a/test/templates/app/views/ajax/update.js.haml
+++ /dev/null
@@ -1,5 +0,0 @@
-- if entry.errors.present?
-  alert('#{escape_javascript(entry.errors.full_messages.join("\n"))}');
-- else
-  document.getElementById('content').innerHTML = "#{escape_javascript(render 'attrs')}";
-
diff --git a/test/templates/app/views/ajax/_actions_index.html.erb b/test/templates/app/views/turbo/_actions_index.html.erb
similarity index 60%
rename from test/templates/app/views/ajax/_actions_index.html.erb
rename to test/templates/app/views/turbo/_actions_index.html.erb
index 7aa1feee..63df4603 100644
--- a/test/templates/app/views/ajax/_actions_index.html.erb
+++ b/test/templates/app/views/turbo/_actions_index.html.erb
@@ -1,9 +1,9 @@
 <%= render partial: 'crud/actions_index' %>
 
-<%= action_link(ti(:'link.ajax'),
+<%= action_link(ti(:'link.turbo'),
                 nil,
-                { action: 'ajax' },
-                method: :get, remote: true) %>
+                { action: 'turbo' },
+                data: { 'turbo-stream': true }) %>
 
 <div id="response"></div>
 
diff --git a/test/templates/app/views/ajax/_actions_index.html.haml b/test/templates/app/views/turbo/_actions_index.html.haml
similarity index 55%
rename from test/templates/app/views/ajax/_actions_index.html.haml
rename to test/templates/app/views/turbo/_actions_index.html.haml
index 414c357d..cb70df12 100644
--- a/test/templates/app/views/ajax/_actions_index.html.haml
+++ b/test/templates/app/views/turbo/_actions_index.html.haml
@@ -1,9 +1,9 @@
 = render 'crud/actions_index'
 
-= action_link(ti(:'link.ajax'),
+= action_link(ti(:'link.turbo'),
               nil,
-              { action: 'ajax' },
-              method: :get, remote: true)
+              { action: 'turbo' },
+              data: { 'turbo-stream': true })
 
 #response
 
diff --git a/test/templates/app/views/turbo/_actions_show.html.erb b/test/templates/app/views/turbo/_actions_show.html.erb
new file mode 100644
index 00000000..4f750baa
--- /dev/null
+++ b/test/templates/app/views/turbo/_actions_show.html.erb
@@ -0,0 +1,7 @@
+<%= index_action_link %>
+<%= edit_action_link %>
+<%= action_link(ti(:"link.edit") + ' Turbo',
+                'pencil',
+                edit_polymorphic_path(path_args(entry)),
+                data: { 'turbo-stream': true }) %>
+<%= destroy_action_link %>
diff --git a/test/templates/app/views/turbo/_actions_show.html.haml b/test/templates/app/views/turbo/_actions_show.html.haml
new file mode 100644
index 00000000..77f0750b
--- /dev/null
+++ b/test/templates/app/views/turbo/_actions_show.html.haml
@@ -0,0 +1,7 @@
+= index_action_link
+= edit_action_link
+= action_link(ti(:"link.edit") + ' Turbo',
+              'pencil',
+              edit_polymorphic_path(path_args(entry)),
+              data: { 'turbo-stream': true })
+= destroy_action_link
diff --git a/test/templates/app/views/turbo/_hello.html.erb b/test/templates/app/views/turbo/_hello.html.erb
new file mode 100644
index 00000000..85ffe1b5
--- /dev/null
+++ b/test/templates/app/views/turbo/_hello.html.erb
@@ -0,0 +1 @@
+hello from turbo
diff --git a/test/templates/app/views/turbo/_hello.html.haml b/test/templates/app/views/turbo/_hello.html.haml
new file mode 100644
index 00000000..85ffe1b5
--- /dev/null
+++ b/test/templates/app/views/turbo/_hello.html.haml
@@ -0,0 +1 @@
+hello from turbo
diff --git a/test/templates/app/views/turbo/edit.turbo_stream.erb b/test/templates/app/views/turbo/edit.turbo_stream.erb
new file mode 100644
index 00000000..791c8f60
--- /dev/null
+++ b/test/templates/app/views/turbo/edit.turbo_stream.erb
@@ -0,0 +1 @@
+<%= turbo_stream.update(:content, partial: 'form') %>
diff --git a/test/templates/app/views/turbo/edit.turbo_stream.haml b/test/templates/app/views/turbo/edit.turbo_stream.haml
new file mode 100644
index 00000000..8a156e95
--- /dev/null
+++ b/test/templates/app/views/turbo/edit.turbo_stream.haml
@@ -0,0 +1 @@
+= turbo_stream.update(:content, partial: 'form')
diff --git a/test/templates/app/views/turbo/show.turbo_stream.erb b/test/templates/app/views/turbo/show.turbo_stream.erb
new file mode 100644
index 00000000..629d3ae9
--- /dev/null
+++ b/test/templates/app/views/turbo/show.turbo_stream.erb
@@ -0,0 +1 @@
+<%= turbo_stream.update(:content, partial: 'attrs') %>
diff --git a/test/templates/app/views/turbo/show.turbo_stream.haml b/test/templates/app/views/turbo/show.turbo_stream.haml
new file mode 100644
index 00000000..f1ef4a34
--- /dev/null
+++ b/test/templates/app/views/turbo/show.turbo_stream.haml
@@ -0,0 +1 @@
+= turbo_stream.update(:content, partial: 'attrs')
diff --git a/test/templates/app/views/turbo/turbo.turbo_stream.erb b/test/templates/app/views/turbo/turbo.turbo_stream.erb
new file mode 100644
index 00000000..0aa25f1b
--- /dev/null
+++ b/test/templates/app/views/turbo/turbo.turbo_stream.erb
@@ -0,0 +1 @@
+<%= turbo_stream.update(:response, partial: 'hello') %>
diff --git a/test/templates/app/views/turbo/turbo.turbo_stream.haml b/test/templates/app/views/turbo/turbo.turbo_stream.haml
new file mode 100644
index 00000000..cb384439
--- /dev/null
+++ b/test/templates/app/views/turbo/turbo.turbo_stream.haml
@@ -0,0 +1 @@
+= turbo_stream.update(:response, partial: 'hello')
diff --git a/test/templates/app/views/turbo/update.turbo_stream.erb b/test/templates/app/views/turbo/update.turbo_stream.erb
new file mode 100644
index 00000000..8f263380
--- /dev/null
+++ b/test/templates/app/views/turbo/update.turbo_stream.erb
@@ -0,0 +1 @@
+<%= turbo_stream.update(:content, partial: entry.errors.present? ? 'form' : 'attrs') %>
diff --git a/test/templates/app/views/turbo/update.turbo_stream.haml b/test/templates/app/views/turbo/update.turbo_stream.haml
new file mode 100644
index 00000000..6fb80336
--- /dev/null
+++ b/test/templates/app/views/turbo/update.turbo_stream.haml
@@ -0,0 +1 @@
+= turbo_stream.update(:content, partial: entry.errors.present? ? 'form' : 'attrs')
diff --git a/test/templates/config/locales/cities.en.yml b/test/templates/config/locales/cities.en.yml
index ffd19abe..30ee6670 100644
--- a/test/templates/config/locales/cities.en.yml
+++ b/test/templates/config/locales/cities.en.yml
@@ -6,10 +6,10 @@ en:
       vips: VIPs
     link:
       maps: Maps
-  ajax:
+  turbo:
     global:
       link:
-        ajax: Ajahx
+        turbo: Turbo
   # cities controller
   admin/cities:
     global:
@@ -26,7 +26,7 @@ en:
     update:
       flash:
         success: The %{model} got an update
-        
+
   # people controller
   people:
     global:
@@ -35,13 +35,13 @@ en:
       i_think_its: I think it's
       nice: Nice
       check_google: Check Google
-  
+
   # vips controller
   vips:
     index:
       title: Listing VIPs
       no_list_entries: No VIPs found
-      
+
   # model associations
   activerecord:
     errors:
@@ -53,4 +53,4 @@ en:
         no_entry: Nobody
         none_available: Nobody here
       city:
-        none_available: No City
\ No newline at end of file
+        none_available: No City
diff --git a/test/templates/config/routes.rb b/test/templates/config/routes.rb
index 1286113a..0dbc03bd 100644
--- a/test/templates/config/routes.rb
+++ b/test/templates/config/routes.rb
@@ -4,7 +4,7 @@
 
   resources :people do
     collection do
-      get :ajax
+      get :turbo
     end
   end
 
@@ -13,12 +13,12 @@
   namespace :admin do
     resources :countries do
       collection do
-        get :ajax
+        get :turbo
       end
 
       resources :cities do
         collection do
-          get :ajax
+          get :turbo
         end
       end
     end
diff --git a/test/templates/spec/controllers/people_controller_spec.rb b/test/templates/spec/controllers/people_controller_spec.rb
index 66f07f45..99943ecf 100644
--- a/test/templates/spec/controllers/people_controller_spec.rb
+++ b/test/templates/spec/controllers/people_controller_spec.rb
@@ -48,33 +48,33 @@
   end
 
   describe_action :get, :show, id: true do
-    context '.js', format: :js do
+    context 'turbo', format: :turbo_stream do
       it_is_expected_to_respond
-      it { expect(response.body).to match(/document.getElementById\('content'\)/) }
+      it { expect(response.body).to match(/<turbo-stream action="update" target="content">/) }
     end
   end
 
   describe_action :get, :edit, id: true do
-    context '.js', format: :js do
+    context 'turbo', format: :turbo_stream do
       it_is_expected_to_respond
-      it { expect(response.body).to match(/document.getElementById\('content'\)/) }
+      it { expect(response.body).to match(/<turbo-stream action="update" target="content">/) }
     end
   end
 
   describe_action :put, :update, id: true do
-    context '.js', format: :js do
+    context 'turbo', format: :turbo_stream do
       context 'with valid params' do
         let(:params) { { person: { name: 'New Name' } } }
 
         it_is_expected_to_respond
-        it { expect(response.body).to match(/document.getElementById\('content'\)/) }
+        it { expect(response.body).to match(/<turbo-stream action="update" target="content">/) }
       end
 
       context 'with invalid params' do
         let(:params) { { person: { name: ' ' } } }
 
         it_is_expected_to_respond
-        it { expect(response.body).to match(/alert/) }
+        it { expect(response.body).to match(/<turbo-stream action="update" target="content">/) }
       end
     end
   end
diff --git a/test/templates/test/controllers/people_controller_test.rb b/test/templates/test/controllers/people_controller_test.rb
index 8f1dbe11..70b12d47 100644
--- a/test/templates/test/controllers/people_controller_test.rb
+++ b/test/templates/test/controllers/people_controller_test.rb
@@ -35,31 +35,31 @@ def test_index_search
     assert_equal 1, entries.size
   end
 
-  def test_show_js
-    get :show, params: { id: test_entry.id }, xhr: true
+  def test_show_turbo
+    get :show, params: { id: test_entry.id }, as: :turbo_stream
     assert_response :success
-    assert_match(/document.getElementById\('content'\)/, response.body)
+    assert_match(/<turbo-stream action="update" target="content">/, response.body)
   end
 
-  def test_edit_js
-    get :edit, params: { id: test_entry.id }, xhr: true
+  def test_edit_turbo
+    get :edit, params: { id: test_entry.id }, as: :turbo_stream
     assert_response :success
-    assert_match(/document.getElementById\('content'\)/, response.body)
+    assert_match(/<turbo-stream action="update" target="content">/, response.body)
   end
 
-  def test_update_js
+  def test_update_turbo
     put :update,
+        as: :turbo_stream,
         params: { id: test_entry.id,
-                  format: :js,
                   person: { name: 'New Name' } }
     assert_response :success
-    assert_match(/document.getElementById\('content'\)/, response.body)
+    assert_match(/<turbo-stream action="update" target="content">/, response.body)
   end
 
-  def test_update_fail_js
+  def test_update_fail_turbo
     put :update,
+        as: :turbo_stream,
         params: { id: test_entry.id,
-                  format: :js,
                   person: { name: ' ' } }
     assert_response :success
     assert_match(/alert/, response.body)