From 514fc0a78115fa6e5ad53fcf84b32642986afb8e Mon Sep 17 00:00:00 2001 From: Hugo Daniel Date: Fri, 20 Jul 2018 13:01:13 +0200 Subject: [PATCH 1/2] Remove dependency to Dash and Jirafe --- spec/features/admin/overview_spec.rb | 39 ---------------------------- 1 file changed, 39 deletions(-) diff --git a/spec/features/admin/overview_spec.rb b/spec/features/admin/overview_spec.rb index 530363929c..47e8d878a7 100644 --- a/spec/features/admin/overview_spec.rb +++ b/spec/features/admin/overview_spec.rb @@ -103,44 +103,5 @@ feature %q{ end end end - - context "with the spree dash configured" do - let(:d1) { create(:distributor_enterprise) } - - before do - stub_jirafe - @enterprise_user.enterprise_roles.build(enterprise: d1).save - end - - around do |example| - with_dash_configured { example.run } - end - - it "has permission to sync analytics" do - visit '/admin' - expect(page).to have_content d1.name - end - end - end - - private - - def stub_jirafe - stub_request(:post, "https://api.jirafe.com/v1/applications/abc123/resources?token="). - to_return(:status => 200, :body => "", :headers => {}) - end - - def with_dash_configured(&block) - Spree::Dash::Config.preferred_app_id = 'abc123' - Spree::Dash::Config.preferred_site_id = 'abc123' - Spree::Dash::Config.preferred_token = 'abc123' - expect(Spree::Dash::Config.configured?).to be true - - block.call - ensure - Spree::Dash::Config.preferred_app_id = nil - Spree::Dash::Config.preferred_site_id = nil - Spree::Dash::Config.preferred_token = nil - expect(Spree::Dash::Config.configured?).to be false end end From ec751c0a78298f9e9a9d9212dd9dcff69aeb2b90 Mon Sep 17 00:00:00 2001 From: Hugo Daniel Date: Tue, 24 Jul 2018 15:27:22 +0200 Subject: [PATCH 2/2] Remove admin analytics ability --- app/models/spree/ability_decorator.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/models/spree/ability_decorator.rb b/app/models/spree/ability_decorator.rb index 385b9be032..54eb462e74 100644 --- a/app/models/spree/ability_decorator.rb +++ b/app/models/spree/ability_decorator.rb @@ -73,7 +73,6 @@ class AbilityDecorator def add_group_management_abilities(user) can [:admin, :index], :overview - can [:admin, :sync], :analytic can [:admin, :index], EnterpriseGroup can [:read, :edit, :update], EnterpriseGroup do |group| user.owned_groups.include? group @@ -86,7 +85,6 @@ class AbilityDecorator can [:create, :search], nil can [:admin, :index], :overview - can [:admin, :sync], :analytic can [:admin, :index, :read, :create, :edit, :update_positions, :destroy], ProducerProperty