solidus_backend 1.3.2 → 1.4.0.beta1

data/spec/features/admin/products/option_types_spec.rb

@@ -27,7 +27,7 @@ describe "Option Types", type: :feature do
     it "should allow an admin to create a new option type", js: true do
       click_link "Option Types"
       click_link "new_option_type_link"
-      expect(page).to have_content("NEW OPTION TYPE")
+      expect(page).to have_content("New Option Type")
       fill_in "option_type_name", with: "shirt colors"
       fill_in "option_type_presentation", with: "colors"
       click_button "Create"
@@ -61,7 +61,7 @@ describe "Option Types", type: :feature do
     create(:option_value)
     click_link "Option Types"
     within('table#listing_option_types') { click_icon :edit }
-    expect(page).to have_content("Editing Option Type")
+    expect(page).to have_content("ProductsOption Typesfoo-size-")
     expect(page).to have_css("tbody#option_values tr", count: 1)
     within("tbody#option_values") do
       find('.spree_remove_fields').click

data/spec/features/admin/products/products_spec.rb

@@ -80,11 +80,11 @@ describe "Products", type: :feature do
         expect(page).to have_content("zomg shirt")
         expect(page).not_to have_content("apache baseball cap")
         check "Show Deleted"
-        click_icon :search
+        click_button 'Search'
         expect(page).to have_content("zomg shirt")
         expect(page).to have_content("apache baseball cap")
         uncheck "Show Deleted"
-        click_icon :search
+        click_button 'Search'
         expect(page).to have_content("zomg shirt")
         expect(page).not_to have_content("apache baseball cap")
       end
@@ -96,13 +96,13 @@ describe "Products", type: :feature do
 
         click_nav "Products"
         fill_in "q_name_cont", with: "ap"
-        click_icon :search
+        click_button 'Search'
         expect(page).to have_content("apache baseball cap")
         expect(page).to have_content("apache baseball cap2")
         expect(page).not_to have_content("zomg shirt")
 
         fill_in "q_variants_including_master_sku_cont", with: "A1"
-        click_icon :search
+        click_button "Search"
         expect(page).to have_content("apache baseball cap")
         expect(page).not_to have_content("apache baseball cap2")
         expect(page).not_to have_content("zomg shirt")
@@ -317,7 +317,7 @@ describe "Products", type: :feature do
       it 'should add option_types when selecting a prototype' do
         visit spree.admin_product_path(product)
         click_link 'Product Properties'
-        expect(page).to have_content("SELECT FROM PROTOTYPE")
+        expect(page).to have_content("Select From Prototype")
         click_link "Select From Prototype"
 
         row = find('#prototypes tr', text: 'Size')
@@ -349,7 +349,7 @@ describe "Products", type: :feature do
 
         # This will show our deleted product
         check "Show Deleted"
-        click_icon :search
+        click_button "Search"
         click_link product.name
         expect(page).to have_field('Master Price', with: product.price.to_f)
       end

data/spec/features/admin/products/properties_spec.rb

@@ -12,7 +12,7 @@ describe "Properties", type: :feature do
     before do
       create(:property, name: 'shirt size', presentation: 'size')
       create(:property, name: 'shirt fit', presentation: 'fit')
-      click_link "Properties"
+      click_link "Property Types"
     end
 
     context "listing product properties" do
@@ -32,7 +32,7 @@ describe "Properties", type: :feature do
     context "searching properties" do
       it 'should list properties matching search query', js: true do
         fill_in "q_name_cont", with: "size"
-        click_icon :search
+        click_button 'Search'
 
         expect(page).to have_content("shirt size")
         expect(page).not_to have_content("shirt fit")
@@ -42,9 +42,9 @@ describe "Properties", type: :feature do
 
   context "creating a property" do
     it "should allow an admin to create a new product property", js: true do
-      click_link "Properties"
+      click_link "Property Types"
       click_link "new_property_link"
-      within('#new_property') { expect(page).to have_content("NEW PROPERTY") }
+      within('#new_property') { expect(page).to have_content("New Property Type") }
 
       fill_in "property_name", with: "color of band"
       fill_in "property_presentation", with: "color"
@@ -53,10 +53,10 @@ describe "Properties", type: :feature do
     end
   end
 
-  context "editing a property" do
+  context "editing a property type" do
     before(:each) do
       create(:property)
-      click_link "Properties"
+      click_link "Property Types"
       within_row(1) { click_icon :edit }
     end
 

data/spec/features/admin/products/prototypes_spec.rb

@@ -48,7 +48,7 @@ describe "Prototypes", type: :feature do
       click_link "Prototypes"
       click_link "new_prototype_link"
       within('#new_prototype') do
-        expect(page).to have_content("NEW PROTOTYPE")
+        expect(page).to have_content("New Prototype")
       end
       fill_in "prototype_name", with: "male shirts"
       click_button "Create"

data/spec/features/admin/products/stock_management_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "Stock Management", type: :feature do
+describe "Product Stock", type: :feature do
   stub_authorization!
 
   before(:each) do
@@ -18,7 +18,7 @@ describe "Stock Management", type: :feature do
 
       click_nav "Products"
       within_row(1) { click_icon :edit }
-      click_link "Stock Management"
+      click_link "Product Stock"
     end
 
     # Regression test for https://github.com/spree/spree/issues/3304
@@ -28,15 +28,15 @@ describe "Stock Management", type: :feature do
         @product = create(:product, name: 'apache baseball cap', price: 10)
         @product.variants.create!(sku: 'FOOBAR')
         Spree::StockLocation.destroy_all
-        click_link "Back To Products List"
+        find_by_id('content-header').click_link('Products')
         within_row(1) do
           click_icon :edit
         end
-        click_link "Stock Management"
+        click_link "Product Stock"
       end
 
       it "renders" do
-        expect(page).to have_content('Products / apache baseball cap')
+        expect(page).to have_content('Productsapache baseball cap')
         expect(page.current_url).to match("admin/products/apache-baseball-cap/stock")
       end
     end

data/spec/features/admin/promotion_adjustments_spec.rb

@@ -15,7 +15,7 @@ describe "Promotion Adjustments", type: :feature do
       fill_in "Base code", with: "order"
       fill_in "Number of codes", with: "1"
       click_button "Create"
-      expect(page).to have_content("Editing Promotion")
+      expect(page).to have_content("PromotionsPromotion")
 
       select2 "Item total", from: "Add rule of type"
       within('#rule_fields') { click_button "Add" }
@@ -51,7 +51,7 @@ describe "Promotion Adjustments", type: :feature do
       fill_in "Base code", with: "single_use"
       fill_in "Number of codes", with: "1"
       click_button "Create"
-      expect(page).to have_content("Editing Promotion")
+      expect(page).to have_content("PromotionsPromotion")
 
       select2 "Create whole-order adjustment", from: "Add action of type"
       within('#action_fields') { click_button "Add" }
@@ -74,7 +74,7 @@ describe "Promotion Adjustments", type: :feature do
     it "should allow an admin to create an automatic promo with flat percent discount" do
       fill_in "Name", with: "Promotion"
       click_button "Create"
-      expect(page).to have_content("Editing Promotion")
+      expect(page).to have_content("PromotionsPromotion")
 
       select2 "Item total", from: "Add rule of type"
       within('#rule_fields') { click_button "Add" }
@@ -108,7 +108,7 @@ describe "Promotion Adjustments", type: :feature do
 
       fill_in "Name", with: "Promotion"
       click_button "Create"
-      expect(page).to have_content("Editing Promotion")
+      expect(page).to have_content("PromotionsPromotion")
 
       select2 "Product(s)", from: "Add rule of type"
       within("#rule_fields") { click_button "Add" }
@@ -139,7 +139,7 @@ describe "Promotion Adjustments", type: :feature do
     it "should allow an admin to create an automatic promotion with free shipping (no code)" do
       fill_in "Name", with: "Promotion"
       click_button "Create"
-      expect(page).to have_content("Editing Promotion")
+      expect(page).to have_content("PromotionsPromotion")
 
       select2 "Item total", from: "Add rule of type"
       within('#rule_fields') { click_button "Add" }
@@ -148,7 +148,7 @@ describe "Promotion Adjustments", type: :feature do
 
       select2 "Free shipping", from: "Add action of type"
       within('#action_fields') { click_button "Add" }
-      expect(page).to have_content('MAKES ALL SHIPMENTS FOR THE ORDER FREE')
+      expect(page).to have_content('Makes all shipments for the order free')
 
       promotion = Spree::Promotion.find_by_name("Promotion")
       expect(promotion.codes).to be_empty
@@ -160,7 +160,7 @@ describe "Promotion Adjustments", type: :feature do
       fill_in "Name", with: "Promotion"
       fill_in "Path", with: "content/cvv"
       click_button "Create"
-      expect(page).to have_content("Editing Promotion")
+      expect(page).to have_content("PromotionsPromotion")
 
       select2 "Create whole-order adjustment", from: "Add action of type"
       within('#action_fields') { click_button "Add" }
@@ -184,7 +184,7 @@ describe "Promotion Adjustments", type: :feature do
     it "ceasing to be eligible for a promotion with item total rule then becoming eligible again" do
       fill_in "Name", with: "Promotion"
       click_button "Create"
-      expect(page).to have_content("Editing Promotion")
+      expect(page).to have_content("PromotionsPromotion")
 
       select2 "Item total", from: "Add rule of type"
       within('#rule_fields') { click_button "Add" }

data/spec/features/admin/promotions/option_value_rule_spec.rb

@@ -18,8 +18,8 @@ feature 'Promotion with option value rule' do
     within("#rules_container") { click_button "Add" }
 
     within("#rules_container .promotion-block") do
-      expect(page).to have_content("PRODUCT")
-      expect(page).to have_content("OPTION VALUES")
+      expect(page).to have_content("Product")
+      expect(page).to have_content("Option Values")
 
       click_button "Add"
     end
@@ -31,7 +31,7 @@ feature 'Promotion with option value rule' do
 
     within('#rules_container') { click_button "Update" }
 
-    first_rule = promotion.rules(true).first
+    first_rule = promotion.rules.reload.first
     expect(first_rule.class).to eq Spree::Promotion::Rules::OptionValue
     expect(first_rule.preferred_eligible_values).to eq Hash[product.id => [option_value.id]]
   end
@@ -78,7 +78,7 @@ feature 'Promotion with option value rule' do
 
       within('#rules_container') { click_button "Update" }
 
-      first_rule = promotion.rules(true).first
+      first_rule = promotion.rules.reload.first
       expect(first_rule.preferred_eligible_values).to eq Hash[variant1.product_id => variant1.option_values.pluck(:id)]
     end
   end

data/spec/features/admin/promotions/product_rule_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+feature 'Promotion with product rule', js: true do
+  stub_authorization!
+
+  given!(:product) { create :product, name: "BlamCo Mac & Cheese", sku: "PRODUCT_SKU" }
+  given!(:variant) { create :variant, sku: "VARIANT_SKU", product: product }
+  given!(:option_value) { variant.option_values.first }
+
+  given(:promotion) { create :promotion }
+
+  def add_promotion_rule_of_type(type)
+    select2 type, from: "Add rule of type"
+    within("#rules_container") { click_button "Add" }
+  end
+
+  background do
+    visit spree.edit_admin_promotion_path(promotion)
+    add_promotion_rule_of_type("Product(s)")
+  end
+
+  it "can select by product sku" do
+    select2_search product.name, from: "Choose products", search: "PRODUCT_SKU"
+  end
+
+  it "can select by variant sku" do
+    select2_search product.name, from: "Choose products", search: "VARIANT_SKU"
+  end
+
+  it "can select by product name" do
+    select2_search product.name, from: "Choose products"
+  end
+end

data/spec/features/admin/promotions/tiered_calculator_spec.rb

@@ -17,8 +17,8 @@ feature "Tiered Calculator Promotions" do
     within('#actions_container') { click_button "Update" }
 
     within("#actions_container .settings") do
-      expect(page).to have_content("BASE PERCENT")
-      expect(page).to have_content("TIERS")
+      expect(page).to have_content("Base Percent")
+      expect(page).to have_content("Tiers")
 
       click_button "Add"
     end

data/spec/features/admin/promotions/user_rule_spec.rb

@@ -9,6 +9,21 @@ feature 'Promotion with user rule', js: true do
     visit spree.edit_admin_promotion_path(promotion)
   end
 
+  context "multiple users" do
+    let!(:user) { create(:user, email: 'foo@example.com') }
+    let!(:other_user) { create(:user, email: 'bar@example.com') }
+
+    scenario "searching a user" do
+      select2 "User", from: "Add rule of type"
+      within("#rules_container") { click_button "Add" }
+
+      select2_search "foo", from: "Choose users", select: false
+
+      expect(page).to have_content('foo@example.com')
+      expect(page).not_to have_content('bar@example.com')
+    end
+  end
+
   context "with an attempted XSS" do
     let(:xss_string) { %(<script>throw("XSS")</script>) }
     given!(:user) { create(:user, email: xss_string) }

data/spec/features/admin/reports_spec.rb

@@ -9,7 +9,7 @@ describe "Reports", type: :feature do
       click_link "Reports"
       click_link "Sales Total"
 
-      expect(page).to have_content("Sales Totals")
+      expect(page).to have_content("ReportsSales Total")
       expect(page).to have_content("Item Total")
       expect(page).to have_content("Adjustment Total")
       expect(page).to have_content("Sales Total")

data/spec/features/admin/users_spec.rb

@@ -33,7 +33,7 @@ describe 'Users', type: :feature do
     end
 
     it 'can go back to the users list' do
-      expect(page).to have_link Spree.t(:back_to_users_list), href: spree.admin_users_path
+      expect(page).to have_link Spree::LegacyUser.model_name.human(count: :other), href: spree.admin_users_path
     end
 
     it 'can navigate to the account page' do
@@ -120,7 +120,7 @@ describe 'Users', type: :feature do
 
     it 'can edit user roles' do
       Spree::Role.create name: "admin"
-      click_link user_a.email
+      click_link 'Account'
 
       check 'user_spree_role_admin'
       click_button 'Update'
@@ -152,6 +152,31 @@ describe 'Users', type: :feature do
       expect(user_a.reload.bill_address.address1).to eq "1313 Mockingbird Ln"
     end
 
+    context 'invalid entry' do
+      around do |example|
+        ::AlwaysInvalidUser = Class.new(Spree.user_class) do
+          validate :always_invalid_email
+          def always_invalid_email
+            errors.add(:email, "is invalid")
+          end
+        end
+        orig_class = Spree.user_class
+        Spree.user_class = "AlwaysInvalidUser"
+
+        example.run
+
+        Spree.user_class = orig_class.name
+        Object.send(:remove_const, "AlwaysInvalidUser")
+      end
+
+      it 'should show validation errors' do
+        fill_in 'user_email', with: 'something'
+        click_button 'Update'
+
+        expect(page).to have_content("Email is invalid")
+      end
+    end
+
     context 'no api key exists' do
       it 'can generate a new api key' do
         within("#admin_user_edit_api_key") do

data/spec/helpers/admin/base_helper_spec.rb

@@ -14,4 +14,34 @@ describe Spree::Admin::BaseHelper, type: :helper do
       expect(datepicker_field_value(date)).to eq("2013/08/14")
     end
   end
+
+  describe "#admin_layout" do
+    subject { admin_layout(value) }
+
+    context "when no initial value has been set" do
+      context "and an argument is sent" do
+        let(:value) { "full-width" }
+        it { is_expected.to eq "full-width" }
+      end
+
+      context "and no argument is sent" do
+        let(:value) { nil }
+        it { is_expected.to be_nil }
+      end
+    end
+
+    context "when an initial value is set" do
+      before { admin_layout("full-width") }
+
+      context "and it is called again without an argument" do
+        let(:value) { nil }
+        it { is_expected.to eq "full-width" }
+      end
+
+      context "and it is called again with an argument" do
+        let(:value) { "centered" }
+        it { is_expected.to eq "centered" }
+      end
+    end
+  end
 end

data/spec/helpers/admin/navigation_helper_spec.rb

@@ -37,8 +37,7 @@ describe Spree::Admin::NavigationHelper, type: :helper do
 
       context "when match_path option is supplied" do
         before do
-          allow(helper).to receive(:admin_path).and_return("/somepath")
-          allow(helper).to receive(:request).and_return(double(ActionDispatch::Request, fullpath: "/somepath/orders/edit/1"))
+          allow(helper).to receive(:request).and_return(double(ActionDispatch::Request, fullpath: "/admin/orders/edit/1"))
         end
 
         it "should be selected if the fullpath matches" do
@@ -72,4 +71,43 @@ describe Spree::Admin::NavigationHelper, type: :helper do
       expect(admin_tab).to end_with("foo</li>")
     end
   end
+
+  describe "#link_to_delete" do
+    let!(:item) { create(:stock_item) }
+    let(:options) { {} }
+    let(:link) { subject }
+
+    subject { helper.link_to_delete(item, options) }
+
+    # object_url is provided by the ResourceController abstract controller.
+    # as we cannot set a custom controller for helper tests, we need to fake it
+    before do
+      allow(helper).to receive(:object_url) do |o|
+        "/stock_items/#{o.to_param}"
+      end
+    end
+
+    it "generates a deletion link for the resource" do
+      expect(link).to include("href=\"/stock_items/#{item.to_param}\"")
+      expect(link).to include("data-action=\"remove\"")
+      expect(link).to include("data-confirm=\"Are you sure?\"")
+      expect(link).to include("<span class=\"text\">Delete</span>")
+    end
+
+    it "allows customization of the url" do
+      options[:url] = "/test/url"
+      expect(link).to include("href=\"/test/url\"")
+    end
+
+    it "allows customization of the link name" do
+      options[:name] = "Delete Item"
+      expect(link).to include("name=\"Delete Item\"")
+      expect(link).to include("<span class=\"text\">Delete Item</span>")
+    end
+
+    it "allows customization of the confirmation message" do
+      options[:confirm] = "Please confirm."
+      expect(link).to include("data-confirm=\"Please confirm.\"")
+    end
+  end
 end