diff --git a/.gitignore b/.gitignore index c7d59cb..1893877 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ \#* *~ .#* +.bundle .DS_Store .idea .project diff --git a/Gemfile b/Gemfile index a518cd4..ec2ed60 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,6 @@ group :development, :test do gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: '2-1-stable' gem 'spree_digital', github: 'halo/spree_digital', branch: '2-1-stable' gem 'spree_editor', github: 'spree/spree_editor' - # gem 'spree_group_pricing', github: 'jdutil/spree_group_pricing' gem 'spree_related_products', github: 'spree/spree_related_products', branch: '2-1-stable' end diff --git a/spec/models/spree/supplier_ability_spec.rb b/spec/models/spree/supplier_ability_spec.rb index ce99530..c08b0a1 100644 --- a/spec/models/spree/supplier_ability_spec.rb +++ b/spec/models/spree/supplier_ability_spec.rb @@ -86,17 +86,20 @@ end end - context 'for GroupPricing' do - let(:resource) { Spree::GroupPrice.new } + # GroupPrice extension was used in a 2.0.x application, and may not be updated for newer version but leaving code for now in case it is. + if defined?(Spree::GroupPrice) + context 'for GroupPricing' do + let(:resource) { Spree::GroupPrice.new } - context 'requested by another suppliers user' do - let(:resource) { Spree::GroupPrice.new({variant: create(:variant, product: create(:product, supplier: create(:supplier)))}, without_protection: true) } - it_should_behave_like 'access denied' - end + context 'requested by another suppliers user' do + let(:resource) { Spree::GroupPrice.new({variant: create(:variant, product: create(:product, supplier: create(:supplier)))}, without_protection: true) } + it_should_behave_like 'access denied' + end - context 'requested by suppliers user' do - let(:resource) { Spree::GroupPrice.new({variant: create(:variant, product: create(:product, supplier: user.supplier))}, without_protection: true) } - it_should_behave_like 'access granted' + context 'requested by suppliers user' do + let(:resource) { Spree::GroupPrice.new({variant: create(:variant, product: create(:product, supplier: user.supplier))}, without_protection: true) } + it_should_behave_like 'access granted' + end end end