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
4b540d2b
Commit
4b540d2b
authored
Mar 14, 2018
by
Pirate Praveen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix test failures with licensee 8.9
parent
46b2933c
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
spec/models/repository_spec.rb
spec/models/repository_spec.rb
+2
-2
spec/requests/api/templates_spec.rb
spec/requests/api/templates_spec.rb
+1
-1
spec/requests/api/v3/templates_spec.rb
spec/requests/api/v3/templates_spec.rb
+1
-1
No files found.
spec/models/repository_spec.rb
View file @
4b540d2b
...
@@ -895,7 +895,7 @@ describe Repository do
...
@@ -895,7 +895,7 @@ describe Repository do
end
end
it
'returns nil when the content is not recognizable'
do
it
'returns nil when the content is not recognizable'
do
repository
.
create_file
(
user
,
'LICENSE'
,
'
Copyright!
'
,
repository
.
create_file
(
user
,
'LICENSE'
,
'
Gitlab B.V.
'
,
message:
'Add LICENSE'
,
branch_name:
'master'
)
message:
'Add LICENSE'
,
branch_name:
'master'
)
expect
(
repository
.
license_key
).
to
be_nil
expect
(
repository
.
license_key
).
to
be_nil
...
@@ -939,7 +939,7 @@ describe Repository do
...
@@ -939,7 +939,7 @@ describe Repository do
end
end
it
'returns nil when the content is not recognizable'
do
it
'returns nil when the content is not recognizable'
do
repository
.
create_file
(
user
,
'LICENSE'
,
'
Copyright!
'
,
repository
.
create_file
(
user
,
'LICENSE'
,
'
Gitlab B.V.
'
,
message:
'Add LICENSE'
,
branch_name:
'master'
)
message:
'Add LICENSE'
,
branch_name:
'master'
)
expect
(
repository
.
license
).
to
be_nil
expect
(
repository
.
license
).
to
be_nil
...
...
spec/requests/api/templates_spec.rb
View file @
4b540d2b
...
@@ -65,7 +65,7 @@ describe API::Templates do
...
@@ -65,7 +65,7 @@ describe API::Templates do
expect
(
json_response
[
'description'
]).
to
include
(
'A short and simple permissive license with conditions'
)
expect
(
json_response
[
'description'
]).
to
include
(
'A short and simple permissive license with conditions'
)
expect
(
json_response
[
'conditions'
]).
to
eq
(
%w[include-copyright]
)
expect
(
json_response
[
'conditions'
]).
to
eq
(
%w[include-copyright]
)
expect
(
json_response
[
'permissions'
]).
to
eq
(
%w[commercial-use modifications distribution private-use]
)
expect
(
json_response
[
'permissions'
]).
to
eq
(
%w[commercial-use modifications distribution private-use]
)
expect
(
json_response
[
'limitations'
]).
to
eq
(
%w[
no-liabili
ty]
)
expect
(
json_response
[
'limitations'
]).
to
eq
(
%w[
liability warran
ty]
)
expect
(
json_response
[
'content'
]).
to
include
(
'MIT License'
)
expect
(
json_response
[
'content'
]).
to
include
(
'MIT License'
)
end
end
end
end
...
...
spec/requests/api/v3/templates_spec.rb
View file @
4b540d2b
...
@@ -57,7 +57,7 @@ describe API::V3::Templates do
...
@@ -57,7 +57,7 @@ describe API::V3::Templates do
expect
(
json_response
[
'description'
]).
to
include
(
'A short and simple permissive license with conditions'
)
expect
(
json_response
[
'description'
]).
to
include
(
'A short and simple permissive license with conditions'
)
expect
(
json_response
[
'conditions'
]).
to
eq
(
%w[include-copyright]
)
expect
(
json_response
[
'conditions'
]).
to
eq
(
%w[include-copyright]
)
expect
(
json_response
[
'permissions'
]).
to
eq
(
%w[commercial-use modifications distribution private-use]
)
expect
(
json_response
[
'permissions'
]).
to
eq
(
%w[commercial-use modifications distribution private-use]
)
expect
(
json_response
[
'limitations'
]).
to
eq
(
%w[
no-liabili
ty]
)
expect
(
json_response
[
'limitations'
]).
to
eq
(
%w[
liability warran
ty]
)
expect
(
json_response
[
'content'
]).
to
include
(
'MIT License'
)
expect
(
json_response
[
'content'
]).
to
include
(
'MIT License'
)
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