code-restyling: test

test/locales/utils/p11n_test.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 # Tests adapted from https://github.com/svenfuchs/rails-i18n

test/mock_helpers/arel.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Arel
   def self.star(*)
     self
@@ -13,8 +15,7 @@ def self.over(*)
 
   module Nodes
     class Grouping
-      def initialize(array)
-      end
+      def initialize(_); end
     end
   end
 end

test/mock_helpers/collection.rb

@@ -1,12 +1,14 @@
+# frozen_string_literal: true
+
 class MockCollection < Array
 
   def initialize(arr=Array(1..1000))
     super
-    @collection = self.clone
+    @collection = clone
   end
 
   def offset(value)
-    @collection = self[value..-1]
+    @collection = self[value..]
     self
   end
 
@@ -33,7 +35,7 @@ def group_values
   class Grouped < MockCollection
 
     def count(*)
-      Hash[@collection.map { |value| [value, value + 1] }]
+      @collection.map { |value| [value, value + 1] }.to_h
     end
 
     def unscope(*)

test/mock_helpers/controller.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 require_relative 'collection'

test/mock_helpers/elasticsearch_rails.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 require 'pagy/extras/elasticsearch_rails'
 
 module MockElasticsearchRails
 
   RESULTS = { 'a' => ('a-1'..'a-1000').to_a,
-              'b' => ('b-1'..'b-1000').to_a }
+              'b' => ('b-1'..'b-1000').to_a }.freeze
 
   class Search
 

test/mock_helpers/searchkick.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 require 'pagy/extras/searchkick'
 
 module MockSearchkick
 
   RESULTS = { 'a' => ('a-1'..'a-1000').to_a,
-              'b' => ('b-1'..'b-1000').to_a }
+              'b' => ('b-1'..'b-1000').to_a }.freeze
 
   class Results
 
@@ -15,13 +17,13 @@ def initialize(query, options={}, &block)
       from     = @options[:per_page] * (@options[:page] - 1)
       results  = @entries[from, @options[:per_page]]
       addition = yield if block
-      @results = results && results.map{|r| "#{addition}#{r}"}
+      @results = results&.map{|r| "#{addition}#{r}"}
     end
 
     def results
       @results.map{|r| "R-#{r}"}
     end
-    alias_method :records, :results      # enables loops in items_test
+    alias records results      # enables loops in items_test
 
     def total_count
       @entries.size
@@ -31,8 +33,8 @@ def total_count
 
   class Model
 
-    def self.search(*args, &block)
-      Results.new(*args, &block)
+    def self.search(...)
+      Results.new(...)
     end
 
     extend Pagy::Searchkick

test/mock_helpers/view.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 class MockView

test/pagy/backend_test.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 require_relative '../test_helper'
@@ -7,7 +6,7 @@
 
   let(:controller) { MockController.new }
 
-  describe "#pagy" do
+  describe '#pagy' do
 
     before do
       @collection = MockCollection.new
@@ -36,7 +35,7 @@
 
   end
 
-  describe "#pagy_get_vars" do
+  describe '#pagy_get_vars' do
 
     before do
       @collection = MockCollection.new
@@ -89,7 +88,7 @@
 
   end
 
-  describe "#pagy_get_items" do
+  describe '#pagy_get_items' do
 
     it 'gets items' do
       collection = MockCollection.new

test/pagy/countless_test.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 require_relative '../test_helper'
@@ -8,7 +7,7 @@
 
   let(:controller) { MockController.new } # page = 3, items = 20
 
-  describe "#finalize" do
+  describe '#finalize' do
 
     before do
       @empty_collection = MockCollection.new([])
@@ -22,7 +21,7 @@
     end
 
     it 'initializes empty collection' do
-      pagy, _ = controller.send(:pagy_countless, @empty_collection, page: 1)
+      pagy, = controller.send(:pagy_countless, @empty_collection, page: 1)
       _(pagy.items).must_equal 20
       _(pagy.pages).must_equal 1
       _(pagy.last).must_equal 1
@@ -33,7 +32,7 @@
     end
 
     it 'initializes first page' do
-      pagy, _ = controller.send(:pagy_countless, @collection, page: 1)
+      pagy, = controller.send(:pagy_countless, @collection, page: 1)
       _(pagy).must_be_instance_of Pagy::Countless
       _(pagy.items).must_equal 20
       _(pagy.last).must_equal 2
@@ -45,7 +44,7 @@
     end
 
     it 'initializes single full page' do
-      pagy, _ = controller.send(:pagy_countless, MockCollection.new(Array(1..20)), page: 1)
+      pagy, = controller.send(:pagy_countless, MockCollection.new(Array(1..20)), page: 1)
       _(pagy.items).must_equal 20
       _(pagy.pages).must_equal 1
       _(pagy.from).must_equal 1
@@ -55,7 +54,7 @@
     end
 
     it 'initialize single partial page' do
-      pagy, _ = controller.send(:pagy_countless, MockCollection.new(Array(1..4)), page: 1)
+      pagy, = controller.send(:pagy_countless, MockCollection.new(Array(1..4)), page: 1)
       _(pagy.items).must_equal 4
       _(pagy.pages).must_equal 1
       _(pagy.from).must_equal 1
@@ -66,7 +65,7 @@
     end
 
     it 'initializes last partial page' do
-      pagy, _ = controller.send(:pagy_countless, @collection, page: last_page)
+      pagy, = controller.send(:pagy_countless, @collection, page: last_page)
       _(pagy.items).must_equal 19
       _(pagy.pages).must_equal last_page
       _(pagy.from).must_equal 41
@@ -76,7 +75,7 @@
     end
 
     it 'handles the :cycle variable' do
-      pagy, _ = controller.send(:pagy_countless, @collection, page: last_page, cycle: true)
+      pagy, = controller.send(:pagy_countless, @collection, page: last_page, cycle: true)
       _(pagy.items).must_equal 19
       _(pagy.pages).must_equal last_page
       _(pagy.from).must_equal 41

test/pagy/exceptions_test.rb

@@ -1,12 +1,11 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 require_relative '../test_helper'
 
 
 describe Pagy::VariableError do
 
-  describe "#variable and #value" do
+  describe '#variable and #value' do
 
     it 'raises for non overflow pages' do
       begin

test/pagy/extras/arel_test.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 require_relative '../../test_helper'
@@ -9,7 +8,7 @@
 
   let(:controller) { MockController.new }
 
-  describe "#pagy_arel" do
+  describe '#pagy_arel' do
 
     before do
       @collection = MockCollection.new
@@ -38,7 +37,7 @@
 
   end
 
-  describe "#pagy_arel_get_vars" do
+  describe '#pagy_arel_get_vars' do
 
     before do
       @collection = MockCollection.new

test/pagy/extras/array_test.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 require_relative '../../test_helper'
@@ -8,7 +7,7 @@
 
   let(:controller) { MockController.new }
 
-  describe "#pagy_array" do
+  describe '#pagy_array' do
 
     before do
       @collection = (1..1000).to_a
@@ -37,7 +36,7 @@
 
   end
 
-  describe "#pagy_array_get_vars" do
+  describe '#pagy_array_get_vars' do
 
     before do
       @collection = (1..1000).to_a

test/pagy/extras/bootstrap_test.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 require_relative '../../test_helper'
@@ -9,7 +8,7 @@
   let(:view) { MockView.new }
   let(:pagy_test_id) { 'test-id' }
 
-  describe "#pagy_bootstrap_nav" do
+  describe '#pagy_bootstrap_nav' do
 
     it 'renders first page' do
       pagy = Pagy.new(count: 1000, page: 1)
@@ -31,7 +30,7 @@
 
   end
 
-  describe "#pagy_bootstrap_nav_js" do
+  describe '#pagy_bootstrap_nav_js' do
 
     it 'renders first page' do
       pagy = Pagy.new(count: 1000, page: 1)
@@ -59,7 +58,7 @@
 
   end
 
-  describe "#pagy_bootstrap_combo_nav_js" do
+  describe '#pagy_bootstrap_combo_nav_js' do
 
     it 'renders first page' do
       pagy = Pagy.new(count: 103, page: 1)

test/pagy/extras/bulma_test.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 require_relative '../../test_helper'
@@ -28,7 +27,7 @@
 
   end
 
-  describe "#pagy_bulma_nav_js" do
+  describe '#pagy_bulma_nav_js' do
 
     it 'renders first page' do
       pagy = Pagy.new(count: 1000, page: 1)
@@ -52,7 +51,7 @@
 
   end
 
-  describe "#pagy_bulma_combo_nav_js" do
+  describe '#pagy_bulma_combo_nav_js' do
 
     it 'renders first page' do
       pagy = Pagy.new(count: 103, page: 1)

test/pagy/extras/countless_test.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 require_relative '../../test_helper'
@@ -19,45 +18,45 @@
     Pagy::VARS[:page_param] = @default_page_param
   end
 
-  describe "#pagy_countless" do
+  describe '#pagy_countless' do
 
     it 'shows current and next for first page' do
-      pagy, _ = controller.send(:pagy_countless, @collection, { size: [1, 4, 4, 1], page: 1 })
+      pagy, = controller.send(:pagy_countless, @collection, { size: [1, 4, 4, 1], page: 1 })
       _(pagy.series).must_equal ['1', 2]
       _(pagy.prev).must_be_nil
       _(pagy.next).must_equal 2
     end
 
     it 'shows start-pages, :gap, before-pages, current and next for intermediate page' do
-      pagy, _ = controller.send(:pagy_countless, @collection, {page: 25})
+      pagy, = controller.send(:pagy_countless, @collection, {page: 25})
       _(pagy.series).must_equal [1, :gap, 21, 22, 23, 24, '25', 26]
       _(pagy.prev).must_equal 24
       _(pagy.next).must_equal 26
     end
 
     it 'shows start-pages, :gap, before-pages, current and next for last page' do
-      pagy, _ = controller.send(:pagy_countless, @collection, {page: last_page})
+      pagy, = controller.send(:pagy_countless, @collection, {page: last_page})
       _(pagy.series).must_equal [1, :gap, 46, 47, 48, 49, '50']
       _(pagy.prev).must_equal 49
       _(pagy.next).must_be_nil
     end
 
     it 'returns empty series for empty :size variable for first page' do
-      pagy, _ = controller.send(:pagy_countless, @collection, {size: [], page: 1})
+      pagy, = controller.send(:pagy_countless, @collection, {size: [], page: 1})
       _(pagy.series).must_equal []
       _(pagy.prev).must_be_nil
       _(pagy.next).must_equal 2
     end
 
     it 'returns empty series for empty :size variable for intermediate page' do
-      pagy, _ = controller.send(:pagy_countless, @collection, {size: [], page: 25})
+      pagy, = controller.send(:pagy_countless, @collection, {size: [], page: 25})
       _(pagy.series).must_equal []
       _(pagy.prev).must_equal 24
       _(pagy.next).must_equal 26
     end
 
     it 'returns empty series for empty :size variable for last page' do
-      pagy, _ = controller.send(:pagy_countless, @collection, {size: [], page: last_page})
+      pagy, = controller.send(:pagy_countless, @collection, {size: [], page: last_page})
       _(pagy.series).must_equal []
       _(pagy.prev).must_equal 49
       _(pagy.next).must_be_nil