fix/refactoring for simplecov setup reporting less coverage than what…

…'s actually covered
ddnexus · Apr 10, 2021 · fc614bd · fc614bd
1 parent 5e6ecf1
commit fc614bd
Show file tree

Hide file tree

Showing 16 changed files with 40 additions and 78 deletions.
diff --git a/.simplecov b/.simplecov
@@ -1,8 +1,13 @@
-if ENV['RUN_SIMPLECOV'] == 'true'
-  SimpleCov.command_name 'main'
-  SimpleCov.start do
-    add_filter %r{^/test/}
-    add_group 'Core', %w[lib/pagy.rb lib/pagy/backend.rb lib/pagy/frontend.rb ]
-    add_group 'Extras', %w[lib/pagy/countless.rb lib/pagy/extras]
+SimpleCov.start do
+  if ENV['RUN_CODECOV'] == 'true'
+    require 'codecov'
+    SimpleCov.formatter = SimpleCov::Formatter::Codecov
+  elsif ENV['SILENT_SIMPLECOV'] == 'true'
+    SimpleCov.formatter = SimpleCov::Formatter::SimpleFormatter
   end
+  SimpleCov.command_name "Task##{$PROCESS_ID}"
+  SimpleCov.merge_timeout 20
+  add_group 'Core', %w[lib/pagy.rb lib/pagy/countless.rb lib/pagy/backend.rb lib/pagy/frontend.rb lib/pagy/exceptions.rb]
+  add_group 'Extras', 'lib/pagy/extras'
+  add_group 'Tests', 'test'
 end
diff --git a/Gemfile b/Gemfile
@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gemspec
+# gemspec
 
 gem 'i18n'
 gem 'oj', require: false     # false is for testing with or without it
@@ -18,7 +18,7 @@ group :test do
   gem 'rubocop-rake', require: false
   gem 'rubocop-minitest', require: false
   gem 'simplecov', require: false
-end
+  end
 
 group :apps do
   gem 'sinatra'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,8 +1,3 @@
-PATH
-  remote: .
-  specs:
-    pagy (4.1.0)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -97,7 +92,6 @@ DEPENDENCIES
   minitest
   minitest-reporters
   oj
-  pagy!
   puma
   rack
   rake

diff --git a/test/mock_helpers/elasticsearch_rails.rb b/test/mock_helpers/elasticsearch_rails.rb
@@ -31,9 +31,10 @@ def records
       @raw_response['hits']['hits'].map{|r| "R-#{r}"}
     end
 
-    def count
-      @raw_response['hits']['hits'].size
-    end
+    # unused by current testing
+    # def count
+    #   @raw_response['hits']['hits'].size
+    # end
 
   end
 
@@ -72,13 +73,14 @@ def initialize(query, options={})
       @response = {'hits' => {'hits' => @search.results, 'total' => RESULTS[query].size}}
     end
 
-    def records
-      @response['hits']['hits'].map{|r| "R-#{r}"}
-    end
-
-    def count
-      @response['hits']['hits'].size
-    end
+    # unused by current testing
+    # def records
+    #   @response['hits']['hits'].map{|r| "R-#{r}"}
+    # end
+    #
+    # def count
+    #   @response['hits']['hits'].size
+    # end
 
   end
 

diff --git a/test/pagy/exceptions_test.rb b/test/pagy/exceptions_test.rb
@@ -2,7 +2,6 @@
 
 require_relative '../test_helper'
 
-
 describe Pagy::VariableError do
 
   describe '#variable and #value' do
@@ -31,34 +30,24 @@
     end
 
     it 'raises for other variables' do
-      begin
-        Pagy.new(count: -10)
-      rescue Pagy::VariableError => e
-        _(e.variable).must_equal :count
-        _(e.value).must_equal(-10)
-      end
-      begin
-        Pagy.new(count: 'string')
-      rescue Pagy::VariableError => e
-        _(e.variable).must_equal :count
-        _(e.value).must_equal 'string'
-      end
+      Pagy.new(count: -10)
+    rescue Pagy::VariableError => e
+      _(e.variable).must_equal :count
+      _(e.value).must_equal(-10)
     end
 
-    it 'rescues as ArgumentError (backward compatible)' do
-      begin
-        Pagy.new(count: 1, page: -10)
-      rescue ArgumentError => e
-        _(e.variable).must_equal :page
-        _(e.value).must_equal(-10)
-      end
+    it 'rescues as ArgumentError' do
+      Pagy.new(count: 1, page: -10)
+    rescue ArgumentError => e
+      _(e.variable).must_equal :page
+      _(e.value).must_equal(-10)
+    end
 
-      begin
-        Pagy.new(count: 'string')
-      rescue ArgumentError => e
-        _(e.variable).must_equal :count
-        _(e.value).must_equal 'string'
-      end
+    it 'does not raise for :count and :offset set to arbitrary strings (converted to 0)' do
+      pagy = Pagy.new(count: 'string', outset: 'string')
+      _(pagy).must_be_instance_of Pagy
+      _(pagy.count).must_equal 0
+      _(pagy.instance_variable_get(:@outset)).must_equal 0
     end
 
   end

diff --git a/test/pagy/extras/elasticsearch_rails_test.rb b/test/pagy/extras/elasticsearch_rails_test.rb
@@ -4,8 +4,6 @@
 require_relative '../../mock_helpers/elasticsearch_rails'
 require 'pagy/extras/overflow'
 
-SimpleCov.command_name 'elasticsearch' if ENV['RUN_SIMPLECOV'] == 'true'
-
 describe Pagy::ElasticsearchRails do
 
   describe '#pagy_search' do

diff --git a/test/pagy/extras/i18n_test.rb b/test/pagy/extras/i18n_test.rb
@@ -4,8 +4,6 @@
 require 'i18n'
 require 'pagy/extras/i18n'
 
-SimpleCov.command_name 'i18n' if ENV['RUN_SIMPLECOV'] == 'true'
-
 describe Pagy::Frontend do
 
   let(:view) { MockView.new }

diff --git a/test/pagy/extras/items_and_countless_test.rb b/test/pagy/extras/items_and_countless_test.rb
@@ -4,8 +4,6 @@
 require 'pagy/extras/countless'
 require 'pagy/extras/items'
 
-SimpleCov.command_name 'items' if ENV['RUN_SIMPLECOV'] == 'true'
-
 describe Pagy::Backend do
 
   describe "#pagy_get_vars and #pagy_countless_get_vars" do

diff --git a/test/pagy/extras/items_and_elasticsearch_test.rb b/test/pagy/extras/items_and_elasticsearch_test.rb
@@ -5,8 +5,6 @@
 require_relative '../../mock_helpers/searchkick'
 require 'pagy/extras/items'
 
-SimpleCov.command_name 'items' if ENV['RUN_SIMPLECOV'] == 'true'
-
 describe Pagy::Backend do
 
   describe "#pagy_get_vars and #pagy_countless_get_vars" do

diff --git a/test/pagy/extras/overflow_test.rb b/test/pagy/extras/overflow_test.rb
@@ -3,8 +3,6 @@
 require_relative '../../test_helper'
 require 'pagy/extras/overflow'
 
-SimpleCov.command_name 'overflow' if ENV['RUN_SIMPLECOV'] == 'true'
-
 describe Pagy do
 
   let(:vars) {{ page: 100, count: 103, items: 10, size: [3, 2, 2, 3] }}

diff --git a/test/pagy/extras/searchkick_test.rb b/test/pagy/extras/searchkick_test.rb
@@ -4,8 +4,6 @@
 require_relative '../../mock_helpers/searchkick'
 require 'pagy/extras/overflow'
 
-SimpleCov.command_name 'elasticsearch' if ENV['RUN_SIMPLECOV'] == 'true'
-
 describe Pagy::Searchkick do
 
   describe '#pagy_search' do

diff --git a/test/pagy/extras/shared_combo_test.rb b/test/pagy/extras/shared_combo_test.rb
@@ -4,8 +4,6 @@
 require 'pagy/extras/items'
 require 'pagy/extras/trim'
 
-SimpleCov.command_name 'shared_combo' if ENV['RUN_SIMPLECOV'] == 'true'
-
 # add tests for oj and pagy_id
 describe Pagy::Frontend do
 

diff --git a/test/pagy/extras/shared_test.rb b/test/pagy/extras/shared_test.rb
@@ -6,9 +6,6 @@
   require 'oj' # all the other tests run without Oj
   require 'pagy/extras/shared'
 
-  SimpleCov.command_name 'shared' if ENV['RUN_SIMPLECOV'] == 'true'
-
-  # add tests for oj and pagy_id
   describe Pagy::Frontend do
 
     let(:view) { MockView.new('http://example.com:3000/foo?') }

diff --git a/test/pagy/extras/support_test.rb b/test/pagy/extras/support_test.rb
@@ -4,8 +4,6 @@
 require 'pagy/extras/support'
 require 'pagy/countless'
 
-SimpleCov.command_name 'support' if ENV['RUN_SIMPLECOV'] == 'true'
-
 describe Pagy::Frontend do
 
   let(:view) { MockView.new }

diff --git a/test/pagy/extras/trim_test.rb b/test/pagy/extras/trim_test.rb
@@ -9,8 +9,6 @@
 require 'pagy/extras/semantic'
 require 'pagy/extras/trim'
 
-SimpleCov.command_name 'trim' if ENV['RUN_SIMPLECOV'] == 'true'
-
 describe Pagy::Frontend do
 
   let(:view) { MockView.new }

diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -6,13 +6,6 @@
 
 require 'simplecov' if ENV['RUN_SIMPLECOV'] == 'true'
 
-if ENV['RUN_CODECOV'] == 'true'
-  require 'codecov'
-  SimpleCov.formatter = SimpleCov::Formatter::Codecov
-elsif ENV['SILENT_SIMPLECOV'] == 'true'
-  SimpleCov.formatter = SimpleCov::Formatter::SimpleFormatter
-end
-
 $LOAD_PATH.unshift File.expand_path('../lib', __dir__)
 
 require 'pagy'