Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
4aa10f53
Commit
4aa10f53
authored
Sep 21, 2017
by
Douwe Maan
Committed by
Rémy Coutable
Sep 21, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Simplify specification of EE license/plan features
parent
13ef4412
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
169 additions
and
246 deletions
+169
-246
app/models/license.rb
app/models/license.rb
+104
-165
ee/app/models/ee/project.rb
ee/app/models/ee/project.rb
+3
-6
lib/gitlab/usage_data.rb
lib/gitlab/usage_data.rb
+1
-0
spec/ee/spec/models/ee/project_spec.rb
spec/ee/spec/models/ee/project_spec.rb
+34
-33
spec/ee/support/license_helpers.rb
spec/ee/support/license_helpers.rb
+0
-3
spec/lib/gitlab/usage_data_spec.rb
spec/lib/gitlab/usage_data_spec.rb
+1
-0
spec/models/license_spec.rb
spec/models/license_spec.rb
+26
-39
No files found.
app/models/license.rb
View file @
4aa10f53
class
License
<
ActiveRecord
::
Base
include
ActionView
::
Helpers
::
NumberHelper
ADMIN_AUDIT_LOG_FEATURE
=
'GitLab_AdminAuditLog'
.
freeze
AUDIT_EVENTS_FEATURE
=
'GitLab_AuditEvents'
.
freeze
AUDITOR_USER_FEATURE
=
'GitLab_Auditor_User'
.
freeze
BURNDOWN_CHARTS_FEATURE
=
'GitLab_BurndownCharts'
.
freeze
CONTRIBUTION_ANALYTICS_FEATURE
=
'GitLab_ContributionAnalytics'
.
freeze
CROSS_PROJECT_PIPELINES_FEATURE
=
'GitLab_CrossProjectPipelines'
.
freeze
DB_LOAD_BALANCING_FEATURE
=
'GitLab_DbLoadBalancing'
.
freeze
DEPLOY_BOARD_FEATURE
=
'GitLab_DeployBoard'
.
freeze
ELASTIC_SEARCH_FEATURE
=
'GitLab_ElasticSearch'
.
freeze
EXPORT_ISSUES_FEATURE
=
'GitLab_ExportIssues'
.
freeze
FAST_FORWARD_MERGE_FEATURE
=
'GitLab_FastForwardMerge'
.
freeze
FILE_LOCKS_FEATURE
=
'GitLab_FileLocks'
.
freeze
GEO_FEATURE
=
'GitLab_Geo'
.
freeze
GROUP_WEBHOOKS_FEATURE
=
'GitLab_GroupWebhooks'
.
freeze
ISSUABLE_DEFAULT_TEMPLATES_FEATURE
=
'GitLab_IssuableDefaultTemplates'
.
freeze
ISSUE_BOARD_FOCUS_MODE_FEATURE
=
'GitLab_IssueBoardFocusMode'
.
freeze
ISSUE_BOARD_MILESTONE_FEATURE
=
'GitLab_IssueBoardMilestone'
.
freeze
GROUP_ISSUE_BOARDS_FEATURE
=
'GitLab_GroupIssueBoards'
.
freeze
ISSUE_WEIGHTS_FEATURE
=
'GitLab_IssueWeights'
.
freeze
JENKINS_INTEGRATION_FEATURE
=
'GitLab_JenkinsIntegration'
.
freeze
JIRA_DEV_PANEL_INTEGRATION_FEATURE
=
'GitLab_JiraDevelopmentPanelIntegration'
.
freeze
LDAP_EXTRAS_FEATURE
=
'GitLab_LdapExtras'
.
freeze
MERGE_REQUEST_APPROVERS_FEATURE
=
'GitLab_MergeRequestApprovers'
.
freeze
MERGE_REQUEST_REBASE_FEATURE
=
'GitLab_MergeRequestRebase'
.
freeze
MERGE_REQUEST_SQUASH_FEATURE
=
'GitLab_MergeRequestSquash'
.
freeze
MULTIPLE_ISSUE_ASSIGNEES_FEATURE
=
'GitLab_MultipleIssueAssignees'
.
freeze
MULTIPLE_ISSUE_BOARDS_FEATURE
=
'GitLab_MultipleIssueBoards'
.
freeze
OBJECT_STORAGE_FEATURE
=
'GitLab_ObjectStorage'
.
freeze
PROTECTED_REFS_FOR_USERS_FEATURE
=
'GitLab_RefPermissionsForUsers'
.
freeze
PUSH_RULES_FEATURE
=
'GitLab_PushRules'
.
freeze
RELATED_ISSUES_FEATURE
=
'GitLab_RelatedIssues'
.
freeze
REPOSITORY_MIRRORS_FEATURE
=
'GitLab_RepositoryMirrors'
.
freeze
REPOSITORY_SIZE_LIMIT_FEATURE
=
'GitLab_RepositorySizeLimit'
.
freeze
SERVICE_DESK_FEATURE
=
'GitLab_ServiceDesk'
.
freeze
VARIABLE_ENVIRONMENT_SCOPE_FEATURE
=
'GitLab_VariableEnvironmentScope'
.
freeze
FEATURE_CODES
=
{
admin_audit_log:
ADMIN_AUDIT_LOG_FEATURE
,
auditor_user:
AUDITOR_USER_FEATURE
,
db_load_balancing:
DB_LOAD_BALANCING_FEATURE
,
elastic_search:
ELASTIC_SEARCH_FEATURE
,
geo:
GEO_FEATURE
,
ldap_extras:
LDAP_EXTRAS_FEATURE
,
object_storage:
OBJECT_STORAGE_FEATURE
,
related_issues:
RELATED_ISSUES_FEATURE
,
repository_size_limit:
REPOSITORY_SIZE_LIMIT_FEATURE
,
service_desk:
SERVICE_DESK_FEATURE
,
variable_environment_scope:
VARIABLE_ENVIRONMENT_SCOPE_FEATURE
,
# Features that make sense to Namespace:
audit_events:
AUDIT_EVENTS_FEATURE
,
burndown_charts:
BURNDOWN_CHARTS_FEATURE
,
contribution_analytics:
CONTRIBUTION_ANALYTICS_FEATURE
,
cross_project_pipelines:
CROSS_PROJECT_PIPELINES_FEATURE
,
deploy_board:
DEPLOY_BOARD_FEATURE
,
export_issues:
EXPORT_ISSUES_FEATURE
,
fast_forward_merge:
FAST_FORWARD_MERGE_FEATURE
,
file_locks:
FILE_LOCKS_FEATURE
,
group_webhooks:
GROUP_WEBHOOKS_FEATURE
,
issuable_default_templates:
ISSUABLE_DEFAULT_TEMPLATES_FEATURE
,
issue_board_focus_mode:
ISSUE_BOARD_FOCUS_MODE_FEATURE
,
issue_board_milestone:
ISSUE_BOARD_MILESTONE_FEATURE
,
group_issue_boards:
GROUP_ISSUE_BOARDS_FEATURE
,
issue_weights:
ISSUE_WEIGHTS_FEATURE
,
jenkins_integration:
JENKINS_INTEGRATION_FEATURE
,
jira_dev_panel_integration:
JIRA_DEV_PANEL_INTEGRATION_FEATURE
,
merge_request_approvers:
MERGE_REQUEST_APPROVERS_FEATURE
,
merge_request_rebase:
MERGE_REQUEST_REBASE_FEATURE
,
merge_request_squash:
MERGE_REQUEST_SQUASH_FEATURE
,
multiple_issue_assignees:
MULTIPLE_ISSUE_ASSIGNEES_FEATURE
,
multiple_issue_boards:
MULTIPLE_ISSUE_BOARDS_FEATURE
,
protected_refs_for_users:
PROTECTED_REFS_FOR_USERS_FEATURE
,
push_rules:
PUSH_RULES_FEATURE
,
repository_mirrors:
REPOSITORY_MIRRORS_FEATURE
}.
freeze
STARTER_PLAN
=
'starter'
.
freeze
PREMIUM_PLAN
=
'premium'
.
freeze
ULTIMATE_PLAN
=
'ultimate'
.
freeze
EARLY_ADOPTER_PLAN
=
'early_adopter'
.
freeze
EES_FEATURES
=
[
{
AUDIT_EVENTS_FEATURE
=>
1
},
{
BURNDOWN_CHARTS_FEATURE
=>
1
},
{
CONTRIBUTION_ANALYTICS_FEATURE
=>
1
},
{
ELASTIC_SEARCH_FEATURE
=>
1
},
{
EXPORT_ISSUES_FEATURE
=>
1
},
{
FAST_FORWARD_MERGE_FEATURE
=>
1
},
{
GROUP_WEBHOOKS_FEATURE
=>
1
},
{
ISSUABLE_DEFAULT_TEMPLATES_FEATURE
=>
1
},
{
ISSUE_BOARD_FOCUS_MODE_FEATURE
=>
1
},
{
ISSUE_BOARD_MILESTONE_FEATURE
=>
1
},
{
ISSUE_WEIGHTS_FEATURE
=>
1
},
{
JENKINS_INTEGRATION_FEATURE
=>
1
},
{
LDAP_EXTRAS_FEATURE
=>
1
},
{
MERGE_REQUEST_APPROVERS_FEATURE
=>
1
},
{
MERGE_REQUEST_REBASE_FEATURE
=>
1
},
{
MERGE_REQUEST_SQUASH_FEATURE
=>
1
},
{
MULTIPLE_ISSUE_ASSIGNEES_FEATURE
=>
1
},
{
MULTIPLE_ISSUE_BOARDS_FEATURE
=>
1
},
{
PUSH_RULES_FEATURE
=>
1
},
{
PROTECTED_REFS_FOR_USERS_FEATURE
=>
1
},
{
RELATED_ISSUES_FEATURE
=>
1
},
{
REPOSITORY_MIRRORS_FEATURE
=>
1
},
{
REPOSITORY_SIZE_LIMIT_FEATURE
=>
1
}
EES_FEATURES
=
%i
[
audit_events
burndown_charts
contribution_analytics
elastic_search
export_issues
fast_forward_merge
group_webhooks
issuable_default_templates
issue_board_focus_mode
issue_board_milestone
issue_weights
jenkins_integration
ldap_extras
merge_request_approvers
merge_request_rebase
merge_request_squash
multiple_issue_assignees
multiple_issue_boards
push_rules
protected_refs_for_users
related_issues
repository_mirrors
repository_size_limit
]
.
freeze
EEP_FEATURES
=
[
*
EES_FEATURES
,
{
ADMIN_AUDIT_LOG_FEATURE
=>
1
},
{
AUDITOR_USER_FEATURE
=>
1
},
{
CROSS_PROJECT_PIPELINES_FEATURE
=>
1
},
{
DB_LOAD_BALANCING_FEATURE
=>
1
},
{
DEPLOY_BOARD_FEATURE
=>
1
},
{
FILE_LOCKS_FEATURE
=>
1
},
{
GEO_FEATURE
=>
1
},
{
OBJECT_STORAGE_FEATURE
=>
1
},
{
JIRA_DEV_PANEL_INTEGRATION_FEATURE
=>
1
},
{
SERVICE_DESK_FEATURE
=>
1
},
{
VARIABLE_ENVIRONMENT_SCOPE_FEATURE
=>
1
},
{
GROUP_ISSUE_BOARDS_FEATURE
=>
1
}
EEP_FEATURES
=
EES_FEATURES
+
%i[
admin_audit_log
auditor_user
cross_project_pipelines
db_load_balancing
deploy_board
file_locks
geo
group_issue_boards
jira_dev_panel_integration
object_storage
service_desk
variable_environment_scope
]
.
freeze
EEU_FEATURES
=
[
*
EEP_FEATURES
# ..
].
freeze
EEU_FEATURES
=
EEP_FEATURES
# List all features available for early adopters,
# i.e. users that started using GitLab.com before
...
...
@@ -135,40 +55,32 @@ class License < ActiveRecord::Base
# Obs.: Do not extend from other feature constants.
# Early adopters should not earn new features as they're
# introduced.
EARLY_ADOPTER_FEATURES
=
[
{
ADMIN_AUDIT_LOG_FEATURE
=>
1
},
{
AUDIT_EVENTS_FEATURE
=>
1
},
{
AUDITOR_USER_FEATURE
=>
1
},
{
BURNDOWN_CHARTS_FEATURE
=>
1
},
{
CONTRIBUTION_ANALYTICS_FEATURE
=>
1
},
{
CROSS_PROJECT_PIPELINES_FEATURE
=>
1
},
{
DB_LOAD_BALANCING_FEATURE
=>
1
},
{
DEPLOY_BOARD_FEATURE
=>
1
},
{
ELASTIC_SEARCH_FEATURE
=>
1
},
{
EXPORT_ISSUES_FEATURE
=>
1
},
{
FAST_FORWARD_MERGE_FEATURE
=>
1
},
{
FILE_LOCKS_FEATURE
=>
1
},
{
GEO_FEATURE
=>
1
},
{
GROUP_WEBHOOKS_FEATURE
=>
1
},
{
ISSUABLE_DEFAULT_TEMPLATES_FEATURE
=>
1
},
{
ISSUE_BOARD_FOCUS_MODE_FEATURE
=>
1
},
{
ISSUE_BOARD_MILESTONE_FEATURE
=>
1
},
{
ISSUE_WEIGHTS_FEATURE
=>
1
},
{
JENKINS_INTEGRATION_FEATURE
=>
1
},
{
LDAP_EXTRAS_FEATURE
=>
1
},
{
MERGE_REQUEST_APPROVERS_FEATURE
=>
1
},
{
MERGE_REQUEST_REBASE_FEATURE
=>
1
},
{
MERGE_REQUEST_SQUASH_FEATURE
=>
1
},
{
MULTIPLE_ISSUE_ASSIGNEES_FEATURE
=>
1
},
{
MULTIPLE_ISSUE_BOARDS_FEATURE
=>
1
},
{
OBJECT_STORAGE_FEATURE
=>
1
},
{
PROTECTED_REFS_FOR_USERS_FEATURE
=>
1
},
{
PUSH_RULES_FEATURE
=>
1
},
{
RELATED_ISSUES_FEATURE
=>
1
},
{
REPOSITORY_MIRRORS_FEATURE
=>
1
},
{
REPOSITORY_SIZE_LIMIT_FEATURE
=>
1
},
{
SERVICE_DESK_FEATURE
=>
1
},
{
VARIABLE_ENVIRONMENT_SCOPE_FEATURE
=>
1
}
EARLY_ADOPTER_FEATURES
=
%i[
audit_events
burndown_charts
contribution_analytics
cross_project_pipelines
deploy_board
export_issues
fast_forward_merge
file_locks
group_webhooks
issuable_default_templates
issue_board_focus_mode
issue_board_milestone
issue_weights
jenkins_integration
merge_request_approvers
merge_request_rebase
merge_request_squash
multiple_issue_assignees
multiple_issue_boards
protected_refs_for_users
push_rules
related_issues
repository_mirrors
service_desk
variable_environment_scope
]
.
freeze
FEATURES_BY_PLAN
=
{
...
...
@@ -178,6 +90,29 @@ class License < ActiveRecord::Base
EARLY_ADOPTER_PLAN
=>
EARLY_ADOPTER_FEATURES
}.
freeze
# Add on codes that may occur in legacy licenses that don't have a plan yet.
FEATURES_FOR_ADD_ONS
=
{
'GitLab_Auditor_User'
=>
:auditor_user
,
'GitLab_DeployBoard'
=>
:deploy_board
,
'GitLab_FileLocks'
=>
:file_locks
,
'GitLab_Geo'
=>
:geo
,
'GitLab_ServiceDesk'
=>
:service_desk
}.
freeze
# Global features that cannot be restricted to only a subset of projects or namespaces.
# Use `License.feature_available?(:feature)` to check if these features are available.
# For all other features, use `project.feature_available?` or `namespace.feature_available?` when possible.
GLOBAL_FEATURES
=
%i[
admin_audit_log
auditor_user
db_load_balancing
elastic_search
geo
ldap_extras
object_storage
repository_size_limit
]
.
freeze
validate
:valid_license
validate
:check_users_limit
,
if: :new_record?
,
unless: :validate_with_trueup?
validate
:check_trueup
,
unless: :persisted?
,
if: :validate_with_trueup?
...
...
@@ -192,7 +127,7 @@ class License < ActiveRecord::Base
class
<<
self
def
features_for_plan
(
plan
)
FEATURES_BY_PLAN
.
fetch
(
plan
,
[])
.
reduce
({},
:merge
)
FEATURES_BY_PLAN
.
fetch
(
plan
,
[])
end
def
current
...
...
@@ -209,11 +144,12 @@ class License < ActiveRecord::Base
RequestStore
.
delete
(
:current_license
)
end
def
plan_includes_feature?
(
plan
,
code
)
features
=
features_for_plan
(
plan
)
feature
=
FEATURE_CODES
.
fetch
(
code
)
def
plan_includes_feature?
(
plan
,
feature
)
if
GLOBAL_FEATURES
.
include?
(
feature
)
raise
ArgumentError
,
"Use `License.feature_available?` for features that cannot be restricted to only a subset of projects or namespaces"
end
features
[
feature
].
to_i
>
0
features
_for_plan
(
plan
).
include?
(
feature
)
end
def
load_license
...
...
@@ -278,20 +214,23 @@ class License < ActiveRecord::Base
end
# New licenses persists only the `plan` (premium, starter, ..). But, old licenses
# keep `add_ons`, therefore this method needs to be backward-compatible in that sense.
# See https://gitlab.com/gitlab-org/gitlab-ee/issues/2019
# keep `add_ons`.
def
add_ons
explicit_add_ons
=
restricted_attr
(
:add_ons
,
{})
plan_features
=
self
.
class
.
features_for_plan
(
plan
)
restricted_attr
(
:add_ons
,
{})
end
def
features_from_add_ons
add_ons
.
map
{
|
name
,
count
|
FEATURES_FOR_ADD_ONS
[
name
]
if
count
>
0
}.
compact
end
explicit_add_ons
.
merge
(
plan_features
)
def
features
@features
||=
(
self
.
class
.
features_for_plan
(
plan
)
+
features_from_add_ons
).
to_set
end
def
feature_available?
(
cod
e
)
def
feature_available?
(
featur
e
)
return
false
if
trial?
&&
expired?
feature
=
FEATURE_CODES
.
fetch
(
code
)
add_ons
[
feature
].
to_i
>
0
features
.
include?
(
feature
)
end
def
restricted_user_count
...
...
ee/app/models/ee/project.rb
View file @
4aa10f53
...
...
@@ -179,14 +179,11 @@ module EE
!
public
?
&&
shared_runners_enabled?
&&
namespace
.
shared_runners_minutes_limit_enabled?
end
# Checks licensed feature availability if `feature` matches any
# key on License::FEATURE_CODES. Otherwise, check feature availability
# through ProjectFeature.
def
feature_available?
(
feature
,
user
=
nil
)
if
License
::
FEATURE_CODES
.
key?
(
feature
)
licensed_feature_available?
(
feature
)
else
if
ProjectFeature
::
FEATURES
.
include?
(
feature
)
super
else
licensed_feature_available?
(
feature
)
end
end
...
...
lib/gitlab/usage_data.rb
View file @
4aa10f53
...
...
@@ -94,6 +94,7 @@ module Gitlab
usage_data
[
:license_user_count
]
=
license
.
restricted_user_count
usage_data
[
:license_starts_at
]
=
license
.
starts_at
usage_data
[
:license_expires_at
]
=
license
.
expires_at
usage_data
[
:license_plan
]
=
license
.
plan
usage_data
[
:license_add_ons
]
=
license
.
add_ons
end
...
...
spec/ee/spec/models/ee/project_spec.rb
View file @
4aa10f53
...
...
@@ -107,57 +107,58 @@ describe Project do
allow
(
namespace
).
to
receive
(
:plan
)
{
plan_license
}
end
License
::
FEATURE_CODES
.
each
do
|
feature_sym
,
feature_code
|
context
feature_sym
.
to_s
do
let
(
:feature
)
{
feature_sym
}
let
(
:feature_code
)
{
feature_code
}
License
::
EEU_FEATURES
.
each
do
|
feature_sym
|
let
(
:feature
)
{
feature_sym
}
context
"checking
#{
feature_sym
}
availability both on Global and Namespace license"
do
let
(
:check_namespace_plan
)
{
true
}
context
feature_sym
.
to_s
do
unless
License
::
GLOBAL_FEATURES
.
include?
(
feature_sym
)
context
"checking
#{
feature_sym
}
availability both on Global and Namespace license"
do
let
(
:check_namespace_plan
)
{
true
}
context
'allowed by Plan License AND Global License'
do
let
(
:allowed_on_global_license
)
{
true
}
let
(
:plan_license
)
{
Plan
.
find_by
(
name:
'gold'
)
}
context
'allowed by Plan License AND Global License'
do
let
(
:allowed_on_global_license
)
{
true
}
let
(
:plan_license
)
{
Plan
.
find_by
(
name:
'gold'
)
}
it
'returns true'
do
is_expected
.
to
eq
(
true
)
it
'returns true'
do
is_expected
.
to
eq
(
true
)
end
end
end
context
'not allowed by Plan License but project and namespace are public'
do
let
(
:allowed_on_global_license
)
{
true
}
let
(
:plan_license
)
{
Plan
.
find_by
(
name:
'bronze'
)
}
context
'not allowed by Plan License but project and namespace are public'
do
let
(
:allowed_on_global_license
)
{
true
}
let
(
:plan_license
)
{
Plan
.
find_by
(
name:
'bronze'
)
}
it
'returns true'
do
allow
(
namespace
).
to
receive
(
:public?
)
{
true
}
allow
(
project
).
to
receive
(
:public?
)
{
true
}
it
'returns true'
do
allow
(
namespace
).
to
receive
(
:public?
)
{
true
}
allow
(
project
).
to
receive
(
:public?
)
{
true
}
is_expected
.
to
eq
(
true
)
is_expected
.
to
eq
(
true
)
end
end
end
unless
License
.
plan_includes_feature?
(
License
::
STARTER_PLAN
,
feature_sym
)
context
'not allowed by Plan License'
do
let
(
:allowed_on_global_license
)
{
true
}
let
(
:plan_license
)
{
Plan
.
find_by
(
name:
'bronze'
)
}
unless
License
.
plan_includes_feature?
(
License
::
STARTER_PLAN
,
feature_sym
)
context
'not allowed by Plan License'
do
let
(
:allowed_on_global_license
)
{
true
}
let
(
:plan_license
)
{
Plan
.
find_by
(
name:
'bronze'
)
}
it
'returns false'
do
is_expected
.
to
eq
(
false
)
it
'returns false'
do
is_expected
.
to
eq
(
false
)
end
end
end
end
context
'not allowed by Global License'
do
let
(
:allowed_on_global_license
)
{
false
}
let
(
:plan_license
)
{
Plan
.
find_by
(
name:
'gold'
)
}
context
'not allowed by Global License'
do
let
(
:allowed_on_global_license
)
{
false
}
let
(
:plan_license
)
{
Plan
.
find_by
(
name:
'gold'
)
}
it
'returns false'
do
is_expected
.
to
eq
(
false
)
it
'returns false'
do
is_expected
.
to
eq
(
false
)
end
end
end
end
context
"when checking
#{
feature_
code
}
only for Global license"
do
context
"when checking
#{
feature_
sym
}
only for Global license"
do
let
(
:check_namespace_plan
)
{
false
}
context
'allowed by Global License'
do
...
...
spec/ee/support/license_helpers.rb
View file @
4aa10f53
...
...
@@ -9,9 +9,6 @@ module EE
# This enables `geo` and disables `deploy_board` features for a spec.
# Other features are still enabled/disabled as defined in the licence.
def
stub_licensed_features
(
features
)
unknown_features
=
features
.
keys
-
License
::
FEATURE_CODES
.
keys
raise
"Unknown features:
#{
unknown_features
.
inspect
}
"
unless
unknown_features
.
empty?
allow
(
License
).
to
receive
(
:feature_available?
).
and_call_original
features
.
each
do
|
feature
,
enabled
|
...
...
spec/lib/gitlab/usage_data_spec.rb
View file @
4aa10f53
...
...
@@ -23,6 +23,7 @@ describe Gitlab::UsageData do
counts
historical_max_users
license_add_ons
license_plan
license_expires_at
license_starts_at
license_user_count
...
...
spec/models/license_spec.rb
View file @
4aa10f53
...
...
@@ -214,21 +214,21 @@ describe License do
describe
'.features_for_plan'
do
it
'returns features for starter plan'
do
expect
(
described_class
.
features_for_plan
(
'starter'
))
.
to
include
(
{
'GitLab_MultipleIssueAssignees'
=>
1
}
)
.
to
include
(
:multiple_issue_assignees
)
end
it
'returns features for premium plan'
do
expect
(
described_class
.
features_for_plan
(
'premium'
))
.
to
include
(
{
'GitLab_MultipleIssueAssignees'
=>
1
,
'GitLab_DeployBoard'
=>
1
,
'GitLab_FileLocks'
=>
1
}
)
.
to
include
(
:multiple_issue_assignees
,
:deploy_board
,
:file_locks
)
end
it
'returns features for early adopter plan'
do
expect
(
described_class
.
features_for_plan
(
'premium'
))
.
to
include
(
{
'GitLab_DeployBoard'
=>
1
,
'GitLab_FileLocks'
=>
1
}
)
.
to
include
(
:deploy_board
,
:file_locks
)
end
it
'returns empty
Hash
if no features for given plan'
do
expect
(
described_class
.
features_for_plan
(
'bronze'
)).
to
eq
(
{}
)
it
'returns empty
array
if no features for given plan'
do
expect
(
described_class
.
features_for_plan
(
'bronze'
)).
to
eq
(
[]
)
end
end
...
...
@@ -264,8 +264,8 @@ describe License do
let
(
:plan
)
{
'premium'
}
let
(
:feature
)
{
nil
}
it
'r
aises KeyError
'
do
expect
{
subject
}.
to
raise_error
(
KeyError
)
it
'r
eturns false
'
do
is_expected
.
to
eq
(
false
)
end
end
end
...
...
@@ -420,73 +420,60 @@ describe License do
end
end
describe
'#add_ons'
do
describe
'#
features_from_
add_ons'
do
context
'without add-ons'
do
it
'returns an empty
Hash
'
do
it
'returns an empty
array
'
do
license
=
build_license_with_add_ons
({},
plan:
'unknown'
)
expect
(
license
.
add_ons
).
to
eq
({}
)
expect
(
license
.
features_from_add_ons
).
to
eq
([]
)
end
end
context
'with add-ons'
do
it
'returns all available add-ons'
do
license
=
build_license_with_add_ons
({
License
::
DEPLOY_BOARD_FEATURE
=>
1
,
License
::
FILE_LOCKS_FEATURE
=>
2
})
expect
(
license
.
add_ons
.
keys
).
to
include
(
License
::
DEPLOY_BOARD_FEATURE
,
License
::
FILE_LOCKS_FEATURE
)
end
it
'can return details about a single add-on'
do
license
=
build_license_with_add_ons
({
License
::
DEPLOY_BOARD_FEATURE
=>
2
})
expect
(
license
.
add_ons
[
License
::
DEPLOY_BOARD_FEATURE
]).
to
eq
(
2
)
end
end
context
'with extra features mapped by plan'
do
it
'returns all available add-ons and extra features'
do
license
=
build_license_with_add_ons
({
License
::
DEPLOY_BOARD_FEATURE
=>
1
},
plan:
License
::
PREMIUM_PLAN
)
eep_features
=
License
::
EEP_FEATURES
.
reduce
({},
:merge
).
keys
license
=
build_license_with_add_ons
({
'GitLab_DeployBoard'
=>
1
,
'GitLab_FileLocks'
=>
2
})
expect
(
license
.
add_ons
.
keys
).
to
include
(
License
::
DEPLOY_BOARD_FEATURE
,
*
eep_features
)
expect
(
license
.
features_from_add_ons
).
to
match_array
([
:deploy_board
,
:file_locks
]
)
end
end
end
describe
'#feature_available?'
do
it
'returns true if add-on exists and have a quantity greater than 0'
do
license
=
build_license_with_add_ons
({
License
::
DEPLOY_BOARD_FEATURE
=>
1
})
license
=
build_license_with_add_ons
({
'GitLab_DeployBoard'
=>
1
})
expect
(
license
.
feature_available?
(
:deploy_board
)).
to
eq
(
true
)
end
it
'returns
false if add-on exists but have a quantity of 0
'
do
license
=
build_license_with_add_ons
({
License
::
DEPLOY_BOARD_FEATURE
=>
0
}
)
it
'returns
true if the feature is included in the plan do
'
do
license
=
build_license_with_add_ons
({
},
plan:
License
::
PREMIUM_PLAN
)
expect
(
license
.
feature_available?
(
:
deploy_board
)).
to
eq
(
fals
e
)
expect
(
license
.
feature_available?
(
:
auditor_user
)).
to
eq
(
tru
e
)
end
it
'returns false if add-on
does not exists
'
do
license
=
build_license_with_add_ons
({})
it
'returns false if add-on
exists but have a quantity of 0
'
do
license
=
build_license_with_add_ons
({
'GitLab_DeployBoard'
=>
0
})
expect
(
license
.
feature_available?
(
:deploy_board
)).
to
eq
(
false
)
end
it
'r
aises error if invalid symbol is sent
'
do
it
'r
eturns false if add-on does not exists
'
do
license
=
build_license_with_add_ons
({})
expect
{
license
.
feature_available?
(
:invalid
)
}.
to
raise_error
(
KeyError
)
expect
(
license
.
feature_available?
(
:deploy_board
)).
to
eq
(
false
)
expect
(
license
.
feature_available?
(
:auditor_user
)).
to
eq
(
false
)
end
context
'with an expired trial license'
do
let
(
:license
)
{
create
(
:license
,
trial:
true
,
expired:
true
)
}
before
(
:all
)
do
described_class
.
destroy_all
create
(
:license
,
trial:
true
,
expired:
true
)
end
::
License
::
FEATURE_CODES
.
keys
do
|
feature_cod
e
|
it
"returns false for
#{
feature
_code
}
"
do
expect
(
license
.
feature_available?
(
feature
_code
)).
to
eq
(
false
)
::
License
::
EES_FEATURES
.
each
do
|
featur
e
|
it
"returns false for
#{
feature
}
"
do
expect
(
license
.
feature_available?
(
feature
)).
to
eq
(
false
)
end
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment