diff --git a/app/views/spree/admin/orders/_shipment.html.erb b/app/views/spree/admin/orders/_shipment.html.erb index c1a7055c02..1ed12d59db 100644 --- a/app/views/spree/admin/orders/_shipment.html.erb +++ b/app/views/spree/admin/orders/_shipment.html.erb @@ -3,19 +3,21 @@ <%= render partial: "spree/admin/variants/split", formats: :js %>
-
- <%= shipment.number %> - - - <%= Spree.t("shipment_states.#{shipment.state}") %> - <%= Spree.t(:package_from) %> - - <%= link_to shipment.stock_location.name, spree.edit_admin_stock_location_url(shipment.stock_location) %> - +
+
+ <%= shipment.number %> + - + <%= Spree.t("shipment_states.#{shipment.state}") %> + <%= Spree.t(:package_from) %> + + <%= link_to shipment.stock_location.name, spree.edit_admin_stock_location_url(shipment.stock_location) %> + +
<% if shipment.ready? and can? :update, shipment %> <%= link_to Spree.t(:ship), 'javascript:;', class: 'ship ml-auto btn btn-primary', data: { 'shipment-number' => shipment.number } %>
<% end %> -
+
diff --git a/spec/features/admin/menus/new_menu_spec.rb b/spec/features/admin/menus/new_menu_spec.rb index d1343f0f3e..a84e59174e 100644 --- a/spec/features/admin/menus/new_menu_spec.rb +++ b/spec/features/admin/menus/new_menu_spec.rb @@ -45,8 +45,6 @@ expect(page).to have_text 'Main Menu has no items. Click the Add New Item button to begin adding links to this menu.' expect(page).to have_selector('a', text: Spree.t('admin.navigation.add_new_item')) - expect(page).not_to have_css('.translation_missing', visible: :all) - # Tests that root name is in sync with menu name. fill_in 'Name', with: 'X14dP' click_on 'Update' diff --git a/spec/features/admin/products/variant_prices_spec.rb b/spec/features/admin/products/variant_prices_spec.rb index 88acf5414b..8869caeef3 100644 --- a/spec/features/admin/products/variant_prices_spec.rb +++ b/spec/features/admin/products/variant_prices_spec.rb @@ -35,7 +35,7 @@ it 'allows to save a compare to price for each currency' do visit spree.admin_product_path(product) click_link 'Prices' - expect(page).to have_content 'COMPARE AT PRICE' + expect(page).to have_content 'Compare at price' fill_in "vp_#{product.master.id}_USD_price", with: '29.95', fill_options: { clear: :backspace } fill_in "vp_#{product.master.id}_EUR_price", with: '21.94', fill_options: { clear: :backspace }