Skip to content

Commit

Permalink
[skip ci] spec fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
damianlegawiec committed May 2, 2024
1 parent 32cb1aa commit d770179
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
20 changes: 11 additions & 9 deletions app/views/spree/admin/orders/_shipment.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,21 @@
<%= render partial: "spree/admin/variants/split", formats: :js %>

<div class="card-header stock-location no-borderb" data-hook="stock-location">
<h5 class="flex-wrap align-items-center card-title mb-0 h6">
<span class="shipment-number"><%= shipment.number %></span>
-
<span class="shipment-state"><%= Spree.t("shipment_states.#{shipment.state}") %></span>
<%= Spree.t(:package_from) %>
<strong class="stock-location-name" data-hook="stock-location-name">
<%= link_to shipment.stock_location.name, spree.edit_admin_stock_location_url(shipment.stock_location) %>
</strong>
<div class="d-flex align-items-center justify-content-between">
<h5 class="flex-wrap align-items-center card-title mb-0 h6">
<span class="shipment-number"><%= shipment.number %></span>
-
<span class="shipment-state"><%= Spree.t("shipment_states.#{shipment.state}") %></span>
<%= Spree.t(:package_from) %>
<strong class="stock-location-name" data-hook="stock-location-name">
<%= link_to shipment.stock_location.name, spree.edit_admin_stock_location_url(shipment.stock_location) %>
</strong>
</h5>
<% 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 } %>
<div class='clearfix'></div>
<% end %>
</h5>
</div>
</div>

<div class="table-responsive bg-white">
Expand Down
2 changes: 0 additions & 2 deletions spec/features/admin/menus/new_menu_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion spec/features/admin/products/variant_prices_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down

0 comments on commit d770179

Please sign in to comment.