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
5960754e
Commit
5960754e
authored
Jul 07, 2017
by
Ruben Davila
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix route used for new trial and add small spec
parent
2eed4a27
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
1 deletion
+15
-1
app/views/dashboard/projects/_blank_state_ee_trial.html.haml
app/views/dashboard/projects/_blank_state_ee_trial.html.haml
+1
-1
spec/factories/licenses.rb
spec/factories/licenses.rb
+1
-0
spec/features/admin/admin_license_spec.rb
spec/features/admin/admin_license_spec.rb
+13
-0
No files found.
app/views/dashboard/projects/_blank_state_ee_trial.html.haml
View file @
5960754e
...
...
@@ -12,5 +12,5 @@
=
link_to
"Enterprise Edition products"
,
"https://about.gitlab.com/products/"
,
target:
"_blank"
,
rel:
"noopener noreferrer nofollow"
You can try these out for free without
any obligation or payment details.
=
link_to
new_admin_trials_
url
,
class:
"btn btn-new"
do
=
link_to
new_admin_trials_
path
,
class:
"btn btn-new"
do
Start free trial
spec/factories/licenses.rb
View file @
5960754e
FactoryGirl
.
define
do
factory
:gitlab_license
,
class:
"Gitlab::License"
do
trait
:trial
do
block_changes_at
nil
restrictions
do
{
trial:
true
}
end
...
...
spec/features/admin/admin_license_spec.rb
View file @
5960754e
...
...
@@ -26,5 +26,18 @@ feature "License Admin", feature: true do
end
end
end
context
'with an expired trial license'
do
let!
(
:license
)
{
create
(
:license
,
trial:
true
,
expired:
true
)
}
it
'does not mention blocking of changes'
do
visit
admin_license_path
page
.
within
'.gitlab-ee-trial-banner'
do
expect
(
page
).
to
have_content
(
'Your Enterprise Edition trial license expired on'
)
expect
(
page
).
not_to
have_content
(
'Pushing code and creation of issues and merge requests has been disabled'
)
end
end
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