mirror of
https://github.com/openfoodfoundation/openfoodnetwork
synced 2026-03-10 03:30:22 +00:00
Fixes rubocop inconsistency
This commit is contained in:
committed by
David Cook
parent
4e24af2f94
commit
03a9f6811c
@@ -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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user