dry_crud 6.0.0 → 8.0.0

data/lib/generators/dry_crud/templates/spec/support/crud_controller_examples.rb

@@ -1,4 +1,4 @@
-require 'support/crud_controller_test_helper'
+require "support/crud_controller_test_helper"
 
 RSpec.configure do |c|
   c.before failing: true do
@@ -14,7 +14,7 @@ end
 # them by passing a skip parameter with context arrays:
 #   include_examples 'crud controller',
 #                    skip: [%w(index html sort) %w(destroy json)]
-shared_examples 'crud controller' do |options|
+shared_examples "crud controller" do |options|
   include CrudControllerTestHelper
 
   render_views
@@ -36,59 +36,57 @@ shared_examples 'crud controller' do |options|
 
   before do
     m = RSpec.current_example.metadata
-    if m[:perform_request] != false && m[:action] && m[:method]
-      perform_combined_request
-    end
+    perform_combined_request if m[:perform_request] != false && m[:action] && m[:method]
   end
 
   describe_action :get, :index,
-                  unless: skip?(options, 'index') do
-    context '.html',
+                  unless: skip?(options, "index") do
+    context ".html",
             format: :html,
             unless: skip?(options, %w[index html]) do
-      context 'plain',
+      context "plain",
               unless: skip?(options, %w[index html plain]),
-              combine: 'ihp' do
+              combine: "ihp" do
         it_is_expected_to_respond
       end
 
-      context 'search',
+      context "search",
               if: described_class.search_columns.present?,
               unless: skip?(options, %w[index html search]),
-              combine: 'ihse' do
+              combine: "ihse" do
         let(:params) { { q: search_value } }
 
         it_is_expected_to_respond
 
-        context 'entries' do
+        context "entries" do
           subject { entries }
           it { is_expected.to include(test_entry) }
         end
       end
 
-      context 'sort',
+      context "sort",
               unless: skip?(options, %w[index html sort]) do
-        context 'ascending',
+        context "ascending",
                 unless: skip?(options, %w[index html sort ascending]),
-                combine: 'ihso' do
-          let(:params) { { sort: sort_column, sort_dir: 'asc' } }
+                combine: "ihso" do
+          let(:params) { { sort: sort_column, sort_dir: "asc" } }
 
           it_is_expected_to_respond
 
-          it 'has sorted entries' do
+          it "has sorted entries" do
             sorted = entries.sort_by(&sort_column.to_sym)
             expect(entries).to eq(sorted)
           end
         end
 
-        context 'descending',
+        context "descending",
                 unless: skip?(options, %w[index html sort descending]),
-                combine: 'ihsd' do
-          let(:params) { { sort: sort_column, sort_dir: 'desc' } }
+                combine: "ihsd" do
+          let(:params) { { sort: sort_column, sort_dir: "desc" } }
 
           it_is_expected_to_respond
 
-          it 'has sorted entries' do
+          it "has sorted entries" do
             sorted = entries.sort_by(&sort_column.to_sym)
             expect(entries).to eq(sorted.reverse)
           end
@@ -96,43 +94,43 @@ shared_examples 'crud controller' do |options|
       end
     end
 
-    context '.json',
+    context ".json",
             format: :json,
             unless: skip?(options, %w[index json]),
-            combine: 'ij' do
+            combine: "ij" do
       it_is_expected_to_respond
-      it { expect(response.body).to start_with('[{') }
+      it { expect(response.body).to start_with("[{") }
     end
   end
 
   describe_action :get, :show,
                   id: true,
-                  unless: skip?(options, 'show') do
-    context '.html',
+                  unless: skip?(options, "show") do
+    context ".html",
             format: :html,
             unless: skip?(options, %w[show html]) do
-      context 'plain',
+      context "plain",
               unless: skip?(options, %w[show html plain]),
-              combine: 'sh' do
+              combine: "sh" do
         it_is_expected_to_respond
       end
 
-      context 'with non-existing id',
+      context "with non-existing id",
               unless: skip?(options,
                             %w[show html with_non_existing_id]) do
         let(:params) { { id: 9999 } }
 
-        it 'raises RecordNotFound', perform_request: false do
+        it "raises RecordNotFound", perform_request: false do
           expect { perform_request }
             .to raise_error(ActiveRecord::RecordNotFound)
         end
       end
     end
 
-    context '.json',
+    context ".json",
             format: :json,
             unless: skip?(options, %w[show json]),
-            combine: 'sj' do
+            combine: "sj" do
       it_is_expected_to_respond
       it_is_expected_to_render_json
     end
@@ -140,14 +138,14 @@ shared_examples 'crud controller' do |options|
 
   describe_action :get, :new,
                   unless: skip?(options, %w[new]) do
-    context 'plain',
+    context "plain",
             unless: skip?(options, %w[new plain]),
-            combine: 'new' do
+            combine: "new" do
       it_is_expected_to_respond
-      it_is_expected_to_persist_entry(false)
+      it_is_expected_to_persist_entry(persist: false)
     end
 
-    context 'with params',
+    context "with params",
             unless: skip?(options, %w[new with_params]) do
       let(:params) { { model_identifier => new_entry_attrs } }
       it_is_expected_to_set_attrs(:new)
@@ -158,54 +156,54 @@ shared_examples 'crud controller' do |options|
                   unless: skip?(options, %w[create]) do
     let(:params) { { model_identifier => new_entry_attrs } }
 
-    it 'adds entry to database', perform_request: false do
+    it "adds entry to database", perform_request: false do
       expect { perform_request }.to change { model_class.count }.by(1)
     end
 
-    context 'html',
+    context "html",
             format: :html,
             unless: skip?(options, %w[create html]) do
       it_is_expected_to_persist_entry # cannot combine this
 
-      context 'with valid params',
+      context "with valid params",
               unless: skip?(options, %w[create html valid]),
-              combine: 'chv' do
+              combine: "chv" do
         it_is_expected_to_redirect_to_show
         it_is_expected_to_set_attrs(:new)
         it_is_expected_to_have_flash(:notice)
       end
 
-      context 'with invalid params',
+      context "with invalid params",
               failing: true,
               unless: skip?(options, %w[create html invalid]),
-              combine: 'chi' do
-        it_is_expected_to_persist_entry(false)
+              combine: "chi" do
+        it_is_expected_to_persist_entry(persist: false)
         it_is_expected_to_set_attrs(:new)
         it_is_expected_to_not_have_flash(:notice)
       end
     end
 
-    context 'json',
+    context "json",
             format: :json,
             unless: skip?(options, %w[create json]) do
       it_is_expected_to_persist_entry # cannot combine this
 
-      context 'with valid params',
+      context "with valid params",
               unless: skip?(options, %w[create json valid]),
-              combine: 'cjv' do
+              combine: "cjv" do
         it_is_expected_to_respond(201)
         it_is_expected_to_set_attrs(:new)
         it_is_expected_to_render_json
       end
 
-      context 'with invalid params',
+      context "with invalid params",
               failing: true,
               unless: skip?(options, %w[create json invalid]),
-              combine: 'cji' do
+              combine: "cji" do
         it_is_expected_to_respond(422)
         it_is_expected_to_set_attrs(:new)
         it_is_expected_to_render_json
-        it_is_expected_to_persist_entry(false)
+        it_is_expected_to_persist_entry(persist: false)
       end
     end
   end
@@ -213,7 +211,7 @@ shared_examples 'crud controller' do |options|
   describe_action :get, :edit,
                   id: true,
                   unless: skip?(options, %w[edit]),
-                  combine: 'edit' do
+                  combine: "edit" do
     it_is_expected_to_respond
   end
 
@@ -222,47 +220,47 @@ shared_examples 'crud controller' do |options|
                   unless: skip?(options, %w[update]) do
     let(:params) { { model_identifier => edit_entry_attrs } }
 
-    it 'updates entry in database', perform_request: false do
+    it "updates entry in database", perform_request: false do
       expect { perform_request }.to change { model_class.count }.by(0)
     end
 
-    context '.html',
+    context ".html",
             format: :html,
             unless: skip?(options, %w[update html]) do
-      context 'with valid params',
+      context "with valid params",
               unless: skip?(options, %w[update html valid]),
-              combine: 'uhv' do
+              combine: "uhv" do
         it_is_expected_to_set_attrs(:edit)
         it_is_expected_to_redirect_to_show
         it_is_expected_to_persist_entry
         it_is_expected_to_have_flash(:notice)
       end
 
-      context 'with invalid params',
+      context "with invalid params",
               failing: true,
               unless: skip?(options, %w[update html invalid]),
-              combine: 'uhi' do
+              combine: "uhi" do
         it_is_expected_to_set_attrs(:edit)
         it_is_expected_to_not_have_flash(:notice)
       end
     end
 
-    context '.json',
+    context ".json",
             format: :json,
             unless: skip?(options, %w[update json]) do
-      context 'with valid params',
+      context "with valid params",
               unless: skip?(options, %w[update json valid]),
-              combine: 'ujv' do
+              combine: "ujv" do
         it_is_expected_to_respond(200)
         it_is_expected_to_set_attrs(:edit)
         it_is_expected_to_render_json
         it_is_expected_to_persist_entry
       end
 
-      context 'with invalid params',
+      context "with invalid params",
               failing: true,
               unless: skip?(options, %w[update json invalid]),
-              combine: 'uji' do
+              combine: "uji" do
         it_is_expected_to_respond(422)
         it_is_expected_to_set_attrs(:edit)
         it_is_expected_to_render_json
@@ -273,33 +271,33 @@ shared_examples 'crud controller' do |options|
   describe_action :delete, :destroy,
                   id: true,
                   unless: skip?(options, %w[destroy]) do
-    it 'removes entry from database', perform_request: false do
+    it "removes entry from database", perform_request: false do
       expect { perform_request }.to change { model_class.count }.by(-1)
     end
 
-    context '.html',
+    context ".html",
             format: :html,
             unless: skip?(options, %w[destroy html]) do
-      context 'successfull', combine: 'dhs' do
+      context "successfull", combine: "dhs" do
         it_is_expected_to_redirect_to_index
         it_is_expected_to_have_flash(:notice)
       end
 
-      context 'with failure', failing: true, combine: 'dhf' do
+      context "with failure", failing: true, combine: "dhf" do
         it_is_expected_to_redirect_to_index
         it_is_expected_to_have_flash(:alert)
       end
     end
 
-    context '.json',
+    context ".json",
             format: :json,
             unless: skip?(options, %w[destroy json]) do
-      context 'successfull', combine: 'djs' do
+      context "successfull", combine: "djs" do
         it_is_expected_to_respond(204)
         it { expect(response.body).to be_blank }
       end
 
-      context 'with failure', failing: true, combine: 'djf' do
+      context "with failure", failing: true, combine: "djf" do
         it_is_expected_to_respond(422)
         it_is_expected_to_render_json
       end

data/lib/generators/dry_crud/templates/spec/support/crud_controller_test_helper.rb

@@ -56,7 +56,7 @@ module CrudControllerTestHelper
   end
 
   def ivar(name)
-    controller.instance_variable_get("@#{name}")
+    controller.instance_variable_get(:"@#{name}")
   end
 
   # The params defining the nesting of the test entry.
@@ -77,7 +77,6 @@ module CrudControllerTestHelper
 
   # Helper methods to describe contexts.
   module ClassMethods
-
     # Describe a certain action and provide some usefull metadata.
     # Tests whether this action is configured to be skipped.
     def describe_action(method, action, metadata = {}, &block)
@@ -96,7 +95,7 @@ module CrudControllerTestHelper
       options ||= {}
       contexts = Array(contexts).flatten
       skips = Array(options[:skip])
-      skips = [skips] if skips.blank? || !skips.first.is_a?(Array)
+      skips = [ skips ] if skips.blank? || !skips.first.is_a?(Array)
 
       skips.flatten.present? &&
         skips.any? { |skip| skip == contexts.take(skip.size) }
@@ -109,15 +108,15 @@ module CrudControllerTestHelper
 
     # Test that a json response is rendered.
     def it_is_expected_to_render_json
-      it { expect(response.body).to start_with('{') }
+      it { expect(response.body).to start_with("{") }
     end
 
     # Test that test_entry_attrs are set on entry.
     def it_is_expected_to_set_attrs(action = nil)
-      it 'sets params as entry attributes' do
-        attrs = send("#{action}_entry_attrs")
+      it "sets params as entry attributes" do
+        attrs = send(:"#{action}_entry_attrs")
         actual = {}
-        attrs.keys.each do |key|
+        attrs.each_key do |key|
           actual[key] = entry.attributes[key.to_s]
         end
         expect(actual).to eq(attrs)
@@ -127,7 +126,7 @@ module CrudControllerTestHelper
     # Test that the response redirects to the index action.
     def it_is_expected_to_redirect_to_index
       it do
-        is_expected.to redirect_to scope_params.merge(action: 'index',
+        is_expected.to redirect_to scope_params.merge(action: "index",
                                                       id: nil,
                                                       returning: true)
       end
@@ -136,7 +135,7 @@ module CrudControllerTestHelper
     # Test that the response redirects to the show action of the current entry.
     def it_is_expected_to_redirect_to_show
       it do
-        is_expected.to redirect_to scope_params.merge(action: 'show',
+        is_expected.to redirect_to scope_params.merge(action: "show",
                                                       id: entry.id)
       end
     end
@@ -156,11 +155,11 @@ module CrudControllerTestHelper
     end
 
     # Test that the current entry is persistend and valid, or not.
-    def it_is_expected_to_persist_entry(bool = true)
-      context 'entry' do
+    def it_is_expected_to_persist_entry(persist: true)
+      context "entry" do
         subject { entry }
 
-        if bool
+        if persist
           it { is_expected.not_to be_new_record }
           it { is_expected.to be_valid }
         else
@@ -169,5 +168,4 @@ module CrudControllerTestHelper
       end
     end
   end
-
 end