From 03a9f6811cdc0fe6fc2506d8c8c31c8e40f4b06f Mon Sep 17 00:00:00 2001 From: filipefurtad0 Date: Mon, 1 Apr 2024 13:13:25 +0100 Subject: [PATCH] Fixes rubocop inconsistency --- spec/system/admin/order_spec.rb | 4 ---- 1 file changed, 4 deletions(-) diff --git a/spec/system/admin/order_spec.rb b/spec/system/admin/order_spec.rb index 17fb1d48bf..04776c1aaf 100644 --- a/spec/system/admin/order_spec.rb +++ b/spec/system/admin/order_spec.rb @@ -777,12 +777,8 @@ RSpec.describe ' it "can edit shipping method" do visit spree.edit_admin_order_path(order) -<<<<<<< HEAD expect(page).not_to have_content different_shipping_method_for_distributor1.name -======= - expect(page).to_not have_content different_shipping_method_for_distributor1.name dismiss_warning ->>>>>>> 2ddec2cff4 (Deals with overlapping elements) find('.edit-method').click