From ffb4ba5ef504b0f623931c5dd2c5e3f2f29b8647 Mon Sep 17 00:00:00 2001 From: Maikel Linke Date: Thu, 25 Mar 2021 18:07:11 +1100 Subject: [PATCH] Style numeric predicate use with Rubocop --- spec/factories/product_factory.rb | 2 +- spec/factories/variant_factory.rb | 2 +- spec/features/admin/order_print_ticket_spec.rb | 2 +- spec/models/spree/adjustment_spec.rb | 2 +- spec/performance/injection_helper_spec.rb | 2 +- spec/support/request/ui_component_helper.rb | 2 +- spec/support/request/web_helper.rb | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/spec/factories/product_factory.rb b/spec/factories/product_factory.rb index bfe9791ccd..aefd7ba399 100644 --- a/spec/factories/product_factory.rb +++ b/spec/factories/product_factory.rb @@ -22,7 +22,7 @@ FactoryBot.define do shipping_category { DefaultShippingCategory.find_or_create } # ensure stock item will be created for this products master - before(:create) { create(:stock_location) if Spree::StockLocation.count == 0 } + before(:create) { create(:stock_location) if Spree::StockLocation.count.zero? } factory :product do transient do diff --git a/spec/factories/variant_factory.rb b/spec/factories/variant_factory.rb index d1586dc19a..61badeed3e 100644 --- a/spec/factories/variant_factory.rb +++ b/spec/factories/variant_factory.rb @@ -15,7 +15,7 @@ FactoryBot.define do option_values { [create(:option_value)] } # ensure stock item will be created for this variant - before(:create) { create(:stock_location) if Spree::StockLocation.count == 0 } + before(:create) { create(:stock_location) if Spree::StockLocation.count.zero? } factory :variant do transient do diff --git a/spec/features/admin/order_print_ticket_spec.rb b/spec/features/admin/order_print_ticket_spec.rb index 15fd46692a..9bfddf205d 100644 --- a/spec/features/admin/order_print_ticket_spec.rb +++ b/spec/features/admin/order_print_ticket_spec.rb @@ -75,7 +75,7 @@ feature ' def adjustments_in_print_data checkout_adjustments_for(order, exclude: [:line_item]). - reject { |a| a.amount == 0 }. + reject { |a| a.amount.zero? }. map do |adjustment| [raw(adjustment.label), display_adjustment_amount(adjustment).format(symbol: false, with_currency: false)] diff --git a/spec/models/spree/adjustment_spec.rb b/spec/models/spree/adjustment_spec.rb index b38666751a..39e48cafc6 100644 --- a/spec/models/spree/adjustment_spec.rb +++ b/spec/models/spree/adjustment_spec.rb @@ -186,7 +186,7 @@ module Spree end it "has tax included" do - expect(adjustment.amount).to be > 0 + expect(adjustment.amount).to be_positive expect(adjustment.included).to be true end diff --git a/spec/performance/injection_helper_spec.rb b/spec/performance/injection_helper_spec.rb index 9bf1d8e147..1d67842640 100644 --- a/spec/performance/injection_helper_spec.rb +++ b/spec/performance/injection_helper_spec.rb @@ -22,7 +22,7 @@ describe InjectionHelper, type: :helper, performance: true do ActiveRecord::Base.connection.query_cache.clear Rails.cache.delete_matched('api\/cached_enterprise_serializer\/enterprises') result = Benchmark.measure { helper.inject_enterprises } - results << result.total if i > 0 + results << result.total if i.positive? puts result end diff --git a/spec/support/request/ui_component_helper.rb b/spec/support/request/ui_component_helper.rb index 6b85e51768..bfaee94a40 100644 --- a/spec/support/request/ui_component_helper.rb +++ b/spec/support/request/ui_component_helper.rb @@ -78,7 +78,7 @@ module UIComponentHelper def wait_for_ajax counter = 0 - while page.execute_script("return $.active").to_i > 0 + while page.execute_script("return $.active").to_i.positive? counter += 1 sleep(0.1) raise "AJAX request took longer than 5 seconds." if counter >= 50 diff --git a/spec/support/request/web_helper.rb b/spec/support/request/web_helper.rb index 334b913d4b..86ba297357 100644 --- a/spec/support/request/web_helper.rb +++ b/spec/support/request/web_helper.rb @@ -157,6 +157,6 @@ module WebHelper end def wait_for_ajax - wait_until { page.evaluate_script("$.active") == 0 } + wait_until { page.evaluate_script("$.active").zero? } end end