[PR-8978] Fixed install generator (#18)

antonpaisov · web-flow · commit 05372c897e69 · 2018-04-20T00:01:07.000+03:00
And Updated fixtures to match corresponding files from a fresh Rails 5.2
project.
diff --git a/lib/talkable/generators/install_generator.rb b/lib/talkable/generators/install_generator.rb
@@ -17,7 +17,7 @@ def add_initializer
     end
 
     def inject_talkable_offer
-      inject_into_file "app/controllers/application_controller.rb", after: "protect_from_forgery with: :exception" do
+      inject_into_file "app/controllers/application_controller.rb", after: "class ApplicationController < ActionController::Base" do
 <<-RUBY
 
   before_action :load_talkable_offer
diff --git a/spec/fixtures/files/application.html.erb b/spec/fixtures/files/application.html.erb
@@ -1,14 +1,15 @@
 <!DOCTYPE html>
 <html>
-<head>
-  <title>Page Title</title>
-  <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => true %>
-  <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
-  <%= csrf_meta_tags %>
-</head>
-<body>
+  <head>
+    <title>Page Title</title>
+    <%= csrf_meta_tags %>
+    <%= csp_meta_tag %>
 
-<%= yield %>
+    <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %>
+    <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
+  </head>
 
-</body>
+  <body>
+    <%= yield %>
+  </body>
 </html>
diff --git a/spec/fixtures/files/application.html.haml b/spec/fixtures/files/application.html.haml
@@ -2,8 +2,9 @@
 %html
   %head
     %title Page Title
-    = stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => true
-    = javascript_include_tag 'application', 'data-turbolinks-track' => true
     = csrf_meta_tags
+    = csp_meta_tag
+    = stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => 'reload'
+    = javascript_include_tag 'application', 'data-turbolinks-track' => 'reload'
   %body
     = yield
diff --git a/spec/fixtures/files/application.html.slim b/spec/fixtures/files/application.html.slim
@@ -3,8 +3,10 @@ html
   head
     title
       | Page Title
-    = stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => true
-    = javascript_include_tag 'application', 'data-turbolinks-track' => true
     = csrf_meta_tags
+    = csp_meta_tag
+    = stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => 'reload'
+    = javascript_include_tag 'application', 'data-turbolinks-track' => 'reload'
+
   body
     = yield
diff --git a/spec/fixtures/files/application_controller.rb b/spec/fixtures/files/application_controller.rb
@@ -1,6 +1,2 @@
 class ApplicationController < ActionController::Base
-  # Prevent CSRF attacks by raising an exception.
-  # For APIs, you may want to use :null_session instead.
-  protect_from_forgery with: :exception
-
 end
diff --git a/spec/fixtures/files/routes.rb b/spec/fixtures/files/routes.rb
@@ -1,4 +1,3 @@
 Rails.application.routes.draw do
-  # You can have the root of your site routed with "root"
-  root 'welcome#index'
+  # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
 end
