Merge pull request spree#9987 from spark-solutions/SD-823

[SD-823] Corrects 'pendingpackage' issue

Author: damianlegawiec

backend/app/views/spree/admin/orders/_shipment.html.erb

@@ -3,7 +3,7 @@
   <%= render partial: "spree/admin/variants/split", formats: :js %>
 
   <div class="card-header stock-location no-borderb" data-hook="stock-location">
-    <h1 class="d-flex flex-wrap align-items-center card-title mb-0 h5">
+    <h1 class="flex-wrap align-items-center card-title mb-0 h5">
       <span class="shipment-number"><%= shipment.number %></span>
       -
       <span class="shipment-state"><%= Spree.t("shipment_states.#{shipment.state}") %></span>

backend/spec/features/admin/orders/shipments_spec.rb

@@ -30,7 +30,7 @@
     it 'can ship a completed order' do
       click_on 'Ship'
 
-      expect(page).to have_content("shipped\npackage")
+      expect(page).to have_content("shipped package")
       expect(order.reload.shipment_state).to eq('shipped')
     end
   end