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
c5f120e4
Commit
c5f120e4
authored
May 20, 2020
by
Zach Hilman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move conan_sources.tgz to recipe and add spec
parent
836fa990
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
4 deletions
+6
-4
ee/app/models/packages/conan/file_metadatum.rb
ee/app/models/packages/conan/file_metadatum.rb
+2
-2
ee/spec/fixtures/conan/recipe_files/conan_sources.tgz
ee/spec/fixtures/conan/recipe_files/conan_sources.tgz
+0
-0
ee/spec/requests/api/conan_packages_spec.rb
ee/spec/requests/api/conan_packages_spec.rb
+4
-2
No files found.
ee/app/models/packages/conan/file_metadatum.rb
View file @
c5f120e4
...
...
@@ -18,8 +18,8 @@ class Packages::Conan::FileMetadatum < ApplicationRecord
enum
conan_file_type:
{
recipe_file:
1
,
package_file:
2
}
RECIPE_FILES
=
%w[conanfile.py conanmanifest.txt]
.
freeze
PACKAGE_FILES
=
%w[conaninfo.txt conanmanifest.txt conan_
export.tgz conan_package.tgz conan_sources
.tgz]
.
freeze
RECIPE_FILES
=
%w[conanfile.py conanmanifest.txt
conan_sources.tgz
]
.
freeze
PACKAGE_FILES
=
%w[conaninfo.txt conanmanifest.txt conan_
package
.tgz]
.
freeze
PACKAGE_BINARY
=
'conan_package.tgz'
private
...
...
ee/spec/fixtures/conan/recipe_files/conan_sources.tgz
0 → 100644
View file @
c5f120e4
File added
ee/spec/requests/api/conan_packages_spec.rb
View file @
c5f120e4
...
...
@@ -419,7 +419,8 @@ describe API::ConanPackages do
let
(
:params
)
do
{
"conanfile.py"
:
24
,
"conanmanifext.txt"
:
123
}
"conanmanifext.txt"
:
123
,
"conan_sources.tgz"
:
523
}
end
subject
{
post
api
(
"/packages/conan/v1/conans/
#{
recipe_path
}
/upload_urls"
),
params:
params
,
headers:
headers
}
...
...
@@ -431,7 +432,8 @@ describe API::ConanPackages do
expected_response
=
{
'conanfile.py'
:
"
#{
Settings
.
gitlab
.
base_url
}
/api/v4/packages/conan/v1/files/
#{
package
.
conan_recipe_path
}
/0/export/conanfile.py"
,
'conanmanifest.txt'
:
"
#{
Settings
.
gitlab
.
base_url
}
/api/v4/packages/conan/v1/files/
#{
package
.
conan_recipe_path
}
/0/export/conanmanifest.txt"
'conanmanifest.txt'
:
"
#{
Settings
.
gitlab
.
base_url
}
/api/v4/packages/conan/v1/files/
#{
package
.
conan_recipe_path
}
/0/export/conanmanifest.txt"
,
'conanmanifest.txt'
:
"
#{
Settings
.
gitlab
.
base_url
}
/api/v4/packages/conan/v1/files/
#{
package
.
conan_recipe_path
}
/0/export/conan_sources.tgz"
}
expect
(
response
.
body
).
to
eq
(
expected_response
.
to_json
)
...
...
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