solidus_backend 1.1.4 → 1.2.0.beta1

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

@@ -36,26 +36,6 @@ feature 'Promotion with option value rule' do
     expect(first_rule.preferred_eligible_values).to eq Hash[product.id => [option_value.id]]
   end
 
-  context "with an attempted XSS" do
-    let(:xss_string) { %(<script>throw("XSS")</script>) }
-    before do
-      option_value.update!(name: xss_string)
-    end
-    scenario "adding an option value rule", js: true do
-      select2 "Option Value(s)", from: "Add rule of type"
-      within("#rules_container") { click_button "Add" }
-
-      within("#rules_container .promotion-block") do
-        click_button "Add"
-      end
-
-      within('.promo-rule-option-value') do
-        targetted_select2_search product.name, from: '.js-promo-rule-option-value-product-select'
-        targetted_select2_search option_value.name, from: '.js-promo-rule-option-value-option-values-select'
-      end
-    end
-  end
-
   context "with an existing option value rule" do
     given(:variant1) { create :variant }
     given(:variant2) { create :variant }

data/spec/features/admin/reports_spec.rb

@@ -20,12 +20,12 @@ describe "Reports", :type => :feature do
     before do
       order = create(:order)
       order.update_columns({:adjustment_total => 100})
-      order.completed_at = Time.now
+      order.completed_at = Time.current
       order.save!
 
       order = create(:order)
       order.update_columns({:adjustment_total => 200})
-      order.completed_at = Time.now
+      order.completed_at = Time.current
       order.save!
 
       #incomplete order

data/spec/features/admin/stock_transfer_spec.rb

@@ -20,7 +20,7 @@ describe 'Stock Transfers', :type => :feature, :js => true do
       fill_in 'stock_transfer_description', with: description
       click_button 'Continue'
 
-      expect(page.find('#stock_transfer_description').value).to eq description
+      expect(page).to have_field('stock_transfer_description', with: description)
 
       select "NY", from: 'stock_transfer[destination_location_id]'
       within "form.edit_stock_transfer" do
@@ -77,7 +77,7 @@ describe 'Stock Transfers', :type => :feature, :js => true do
         visit spree.tracking_info_admin_stock_transfer_path(stock_transfer)
         click_link 'ship'
 
-        first('#confirm-ship-link', visible: false).click
+        find('#confirm-ship-link', visible: false).click
         expect(current_path).to eq spree.admin_stock_transfers_path
         expect(stock_transfer.reload.shipped_at).to_not be_nil
       end
@@ -95,7 +95,7 @@ describe 'Stock Transfers', :type => :feature, :js => true do
 
         click_link 'ship'
 
-        first('#confirm-ship-link', visible: false).click
+        find('#confirm-ship-link', visible: false).click
         expect(current_path).to eq spree.tracking_info_admin_stock_transfer_path(stock_transfer)
         expect(stock_transfer.reload.shipped_at).to be_nil
       end

data/spec/features/admin/store_credits_spec.rb

@@ -24,7 +24,7 @@ describe "Store credits admin" do
       expect(page.current_path).to eq spree.admin_user_store_credits_path(store_credit.user)
 
       store_credit_table = page.find(".twelve.columns > table")
-      expect(store_credit_table.all('tr').count).to eq 1
+      expect(store_credit_table).to have_css('tr', count: 1)
       expect(store_credit_table).to have_content(Spree::Money.new(store_credit.amount).to_s)
       expect(store_credit_table).to have_content(Spree::Money.new(store_credit.amount_used).to_s)
       expect(store_credit_table).to have_content(store_credit.category_name)
@@ -49,7 +49,7 @@ describe "Store credits admin" do
 
       expect(page.current_path).to eq spree.admin_user_store_credits_path(store_credit.user)
       store_credit_table = page.find(".twelve.columns > table")
-      expect(store_credit_table.all('tr').count).to eq 2
+      expect(store_credit_table).to have_css('tr', count: 2)
       expect(Spree::StoreCredit.count).to eq 2
     end
   end

data/spec/features/admin/users_spec.rb

@@ -3,8 +3,8 @@ require 'spec_helper'
 describe 'Users', :type => :feature do
   stub_authorization!
   let!(:country) { create(:country) }
-  let!(:user_a) { create(:user_with_addreses, email: 'a@example.com') }
-  let!(:user_b) { create(:user_with_addreses, email: 'b@example.com') }
+  let!(:user_a) { create(:user_with_addresses, email: 'a@example.com') }
+  let!(:user_b) { create(:user_with_addresses, email: 'b@example.com') }
 
   let(:order) { create(:completed_order_with_totals, user: user_a, number: "R123") }
 
@@ -108,7 +108,7 @@ describe 'Users', :type => :feature do
 
       expect(user_a.reload.email).to eq 'a@example.com99'
       expect(page).to have_text 'Account updated'
-      expect(find_field('user_email').value).to eq 'a@example.com99'
+      expect(page).to have_field('user_email', with: 'a@example.com99')
     end
 
     it 'can edit the user password' do
@@ -126,7 +126,7 @@ describe 'Users', :type => :feature do
       check 'user_spree_role_admin'
       click_button 'Update'
       expect(page).to have_text 'Account updated'
-      expect(find_field('user_spree_role_admin')['checked']).to be true
+      expect(find_field('user_spree_role_admin')).to be_checked
     end
 
     it 'can edit user shipping address' do
@@ -135,7 +135,7 @@ describe 'Users', :type => :feature do
       within("#admin_user_edit_addresses") do
         fill_in "user_ship_address_attributes_address1", with: "1313 Mockingbird Ln"
         click_button 'Update'
-        expect(find_field('user_ship_address_attributes_address1').value).to eq "1313 Mockingbird Ln"
+        expect(page).to have_field('user_ship_address_attributes_address1', with: "1313 Mockingbird Ln")
       end
 
       expect(user_a.reload.ship_address.address1).to eq "1313 Mockingbird Ln"
@@ -147,7 +147,7 @@ describe 'Users', :type => :feature do
       within("#admin_user_edit_addresses") do
         fill_in "user_bill_address_attributes_address1", with: "1313 Mockingbird Ln"
         click_button 'Update'
-        expect(find_field('user_bill_address_attributes_address1').value).to eq "1313 Mockingbird Ln"
+        expect(page).to have_field('user_bill_address_attributes_address1', with: "1313 Mockingbird Ln")
       end
 
       expect(user_a.reload.bill_address.address1).to eq "1313 Mockingbird Ln"

data/spec/helpers/admin/navigation_helper_spec.rb

@@ -69,5 +69,10 @@ describe Spree::Admin::NavigationHelper, :type => :helper do
         end
       end
     end
+
+    it "should accept a block of content to append" do
+      admin_tab = helper.tab(:orders){ 'foo' }
+      expect(admin_tab).to end_with("foo</li>")
+    end
   end
 end

data/spec/helpers/admin/reimbursements_helper_spec.rb

@@ -27,7 +27,7 @@ describe Spree::Admin::ReimbursementsHelper, type: :helper do
       let(:status) { 'noop' }
 
       it 'should raise an error' do
-        expect{ subject }.to raise_error(RuntimeError)
+        expect{ subject }.to raise_error(RuntimeError, "unknown reimbursement status: noop")
       end
     end
   end

data/spec/helpers/admin/store_credit_events_helper_spec.rb

@@ -88,7 +88,7 @@ describe Spree::Admin::StoreCreditEventsHelper, type: :helper do
       let(:originator) { create(:store_credit_update_reason) }
 
       it "raises an error" do
-        expect { subject }.to raise_error(RuntimeError)
+        expect { subject }.to raise_error(RuntimeError, "Unexpected originator type Spree::StoreCreditUpdateReason")
       end
     end
   end

data/spec/spec_helper.rb

@@ -64,7 +64,6 @@ RSpec.configure do |config|
   config.use_transactional_fixtures = false
 
   config.before :suite do
-    Capybara.match = :prefer_exact
     DatabaseCleaner.clean_with :truncation
   end
 
@@ -73,6 +72,7 @@ RSpec.configure do |config|
     reset_spree_preferences
     WebMock.disable!
     if RSpec.current_example.metadata[:js]
+      page.driver.browser.url_blacklist = ['http://fonts.googleapis.com']
       DatabaseCleaner.strategy = :truncation
     else
       DatabaseCleaner.strategy = :transaction
@@ -87,6 +87,8 @@ RSpec.configure do |config|
     DatabaseCleaner.clean
   end
 
+  config.include BaseFeatureHelper, :type => :feature
+
   config.after(:each, :type => :feature) do |example|
     missing_translations = page.body.scan(/translation missing: #{I18n.locale}\.(.*?)[\s<\"&]/)
     if missing_translations.any?

data/spec/support/feature/base_feature_helper.rb

@@ -0,0 +1,10 @@
+module BaseFeatureHelper
+  def click_nav(nav_text, subnav_text=nil)
+    primary_nav = find(".admin-nav-menu>ul>li>a", text: %r{#{nav_text}}i)
+    if subnav_text
+      primary_nav.find('+ul>li>a', text: %r{#{subnav_text}}i).click
+    else
+      primary_nav.click
+    end
+  end
+end