Merge branch 'tc-namespace-license-checks--contribution-analytics' into 'master'

Namespace license checks for Contribution Analytics (EES)

Closes #2579

See merge request !2302

app/controllers/ee/groups/application_controller.rb

+module EE
+  module Groups
+    module ApplicationController
+      def check_group_feature_available!(feature)
+        render_404 unless group.feature_available?(feature)
+      end
+
+      def method_missing(method_sym, *arguments, &block)
+        case method_sym.to_s
+        when /\Acheck_group_(.*)_available!\z/
+          check_group_feature_available!($1.to_sym)
+        else
+          super
+        end
+      end
+    end
+  end
+end

app/controllers/groups/analytics_controller.rb

 class Groups::AnalyticsController < Groups::ApplicationController
   before_action :group
+  before_action :check_group_contribution_analytics_available!
 
   layout 'group'
 

app/controllers/groups/application_controller.rb

 class Groups::ApplicationController < ApplicationController
   include RoutableActions
+  prepend EE::Groups::ApplicationController
 
   layout 'group'
 

app/models/license.rb

@@ -3,6 +3,7 @@ class License < ActiveRecord::Base
 
   AUDITOR_USER_FEATURE = 'GitLab_Auditor_User'.freeze
   BURNDOWN_CHARTS_FEATURE = 'BurndownCharts'.freeze
+  CONTRIBUTION_ANALYTICS_FEATURE = 'ContributionAnalytics'.freeze
   DEPLOY_BOARD_FEATURE = 'GitLab_DeployBoard'.freeze
   ELASTIC_SEARCH_FEATURE = 'GitLab_ElasticSearch'.freeze
   EXPORT_ISSUES_FEATURE  = 'GitLab_ExportIssues'.freeze
@@ -26,6 +27,7 @@ class License < ActiveRecord::Base
 
     # Features that make sense to Namespace:
     burndown_charts: BURNDOWN_CHARTS_FEATURE,
+    contribution_analytics: CONTRIBUTION_ANALYTICS_FEATURE,
     deploy_board: DEPLOY_BOARD_FEATURE,
     export_issues: EXPORT_ISSUES_FEATURE,
     fast_forward_merge: FAST_FORWARD_MERGE_FEATURE,
@@ -42,6 +44,7 @@ class License < ActiveRecord::Base
 
   EES_FEATURES = [
     { BURNDOWN_CHARTS_FEATURE => 1 },
+    { CONTRIBUTION_ANALYTICS_FEATURE => 1 },
     { ELASTIC_SEARCH_FEATURE => 1 },
     { EXPORT_ISSUES_FEATURE => 1 },
     { FAST_FORWARD_MERGE_FEATURE => 1 },
@@ -73,10 +76,9 @@ class License < ActiveRecord::Base
   # Early adopters should not earn new features as they're
   # introduced.
   EARLY_ADOPTER_FEATURES = [
-    # TODO: Add EES features
-    # https://gitlab.com/gitlab-org/gitlab-ee/issues/2335)
     { AUDITOR_USER_FEATURE => 1 },
     { BURNDOWN_CHARTS_FEATURE => 1 },
+    { CONTRIBUTION_ANALYTICS_FEATURE => 1 },
     { DEPLOY_BOARD_FEATURE => 1 },
     { EXPORT_ISSUES_FEATURE => 1 },
     { FAST_FORWARD_MERGE_FEATURE => 1 },

app/views/layouts/nav/_group.html.haml

@@ -24,10 +24,11 @@
       = link_to group_group_members_path(@group), title: 'Members' do
         %span
           Members
-    = nav_link(path: 'analytics#show') do
-      = link_to group_analytics_path(@group), title: 'Contribution Analytics', data: {placement: 'right'} do
-        %span
-          Contribution Analytics
+    - if @group.feature_available?(:contribution_analytics)
+      = nav_link(path: 'analytics#show') do
+        = link_to group_analytics_path(@group), title: 'Contribution Analytics', data: {placement: 'right'} do
+          %span
+            Contribution Analytics
     - if current_user && can?(current_user, :admin_group, @group)
       = nav_link(path: %w[groups#projects groups#edit ldap_group_links#index hooks#index audit_events#index pipeline_quota#index]) do
         = link_to edit_group_path(@group), title: 'Settings' do

changelogs/unreleased-ee/tc-namespace-license-checks--contribution-analytics.yml

+---
+title: Add namespace license checks for Contribution Analytics
+merge_request: 2302
+author:

spec/controllers/groups/analytics_controller_spec.rb

@@ -39,6 +39,14 @@ describe Groups::AnalyticsController do
     create_push_event(user3, project)
   end
 
+  it 'returns 404 when feature is not available' do
+    stub_licensed_features(contribution_analytics: false)
+
+    get :show, group_id: group.path
+
+    expect(response).to have_http_status(404)
+  end
+
   it 'sets instance variables properly' do
     get :show, group_id: group.path
 

spec/views/layouts/nav/ee/_group.html.haml_spec.rb

+require 'spec_helper'
+
+describe 'layouts/nav/_group' do
+  before do
+    assign(:group, create(:group))
+  end
+
+  describe 'contribution analytics tab' do
+    it 'is not visible when there is no valid license' do
+      stub_licensed_features(contribution_analytics: false)
+
+      render
+
+      expect(rendered).not_to have_text 'Contribution Analytics'
+    end
+
+    it 'is not visible when there is no valid license' do
+      stub_licensed_features(contribution_analytics: true)
+
+      render
+
+      expect(rendered).to have_text 'Contribution Analytics'
+    end
+  end
+end