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
4e1f7cf8
Commit
4e1f7cf8
authored
Jun 26, 2020
by
Giorgenes Gelatti
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve package factories
Fix a few package factories which don't work on their own.
parent
afca7045
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
33 additions
and
17 deletions
+33
-17
ee/spec/factories/packages.rb
ee/spec/factories/packages.rb
+29
-12
ee/spec/models/packages/package_file_spec.rb
ee/spec/models/packages/package_file_spec.rb
+4
-5
No files found.
ee/spec/factories/packages.rb
View file @
4e1f7cf8
...
@@ -118,14 +118,29 @@ FactoryBot.define do
...
@@ -118,14 +118,29 @@ FactoryBot.define do
end
end
factory
:composer_metadatum
,
class:
'Packages::Composer::Metadatum'
do
factory
:composer_metadatum
,
class:
'Packages::Composer::Metadatum'
do
package
{
create
(
:composer_package
)
}
target_sha
{
'123'
}
composer_json
{
{
name:
'foo'
}
}
end
end
factory
:package_build_info
,
class:
'Packages::BuildInfo'
do
factory
:package_build_info
,
class:
'Packages::BuildInfo'
do
package
end
end
factory
:package_file
,
class:
'Packages::PackageFile'
do
factory
:package_file
,
class:
'Packages::PackageFile'
do
package
package
file_name
{
'somefile.txt'
}
transient
do
file_fixture
{
'spec/fixtures/packages/conan/recipe_files/conanfile.py'
}
end
after
(
:build
)
do
|
package_file
,
evaluator
|
package_file
.
file
=
fixture_file_upload
(
evaluator
.
file_fixture
)
end
factory
:conan_package_file
do
factory
:conan_package_file
do
package
{
create
(
:conan_package
,
without_package_files:
true
)
}
package
{
create
(
:conan_package
,
without_package_files:
true
)
}
...
@@ -140,7 +155,7 @@ FactoryBot.define do
...
@@ -140,7 +155,7 @@ FactoryBot.define do
end
end
end
end
file
{
fixture_file_upload
(
'spec/fixtures/packages/conan/recipe_files/conanfile.py'
)
}
file
_fixture
{
'spec/fixtures/packages/conan/recipe_files/conanfile.py'
}
file_name
{
'conanfile.py'
}
file_name
{
'conanfile.py'
}
file_sha1
{
'be93151dc23ac34a82752444556fe79b32c7a1ad'
}
file_sha1
{
'be93151dc23ac34a82752444556fe79b32c7a1ad'
}
file_md5
{
'12345abcde'
}
file_md5
{
'12345abcde'
}
...
@@ -154,7 +169,7 @@ FactoryBot.define do
...
@@ -154,7 +169,7 @@ FactoryBot.define do
end
end
end
end
file
{
fixture_file_upload
(
'spec/fixtures/packages/conan/recipe_files/conanmanifest.txt'
)
}
file
_fixture
{
'spec/fixtures/packages/conan/recipe_files/conanmanifest.txt'
}
file_name
{
'conanmanifest.txt'
}
file_name
{
'conanmanifest.txt'
}
file_sha1
{
'be93151dc23ac34a82752444556fe79b32c7a1ad'
}
file_sha1
{
'be93151dc23ac34a82752444556fe79b32c7a1ad'
}
file_md5
{
'12345abcde'
}
file_md5
{
'12345abcde'
}
...
@@ -168,7 +183,7 @@ FactoryBot.define do
...
@@ -168,7 +183,7 @@ FactoryBot.define do
end
end
end
end
file
{
fixture_file_upload
(
'spec/fixtures/packages/conan/package_files/conanmanifest.txt'
)
}
file
_fixture
{
'spec/fixtures/packages/conan/package_files/conanmanifest.txt'
}
file_name
{
'conanmanifest.txt'
}
file_name
{
'conanmanifest.txt'
}
file_sha1
{
'be93151dc23ac34a82752444556fe79b32c7a1ad'
}
file_sha1
{
'be93151dc23ac34a82752444556fe79b32c7a1ad'
}
file_md5
{
'12345abcde'
}
file_md5
{
'12345abcde'
}
...
@@ -182,7 +197,7 @@ FactoryBot.define do
...
@@ -182,7 +197,7 @@ FactoryBot.define do
end
end
end
end
file
{
fixture_file_upload
(
'spec/fixtures/packages/conan/package_files/conaninfo.txt'
)
}
file
_fixture
{
'spec/fixtures/packages/conan/package_files/conaninfo.txt'
}
file_name
{
'conaninfo.txt'
}
file_name
{
'conaninfo.txt'
}
file_sha1
{
'be93151dc23ac34a82752444556fe79b32c7a1ad'
}
file_sha1
{
'be93151dc23ac34a82752444556fe79b32c7a1ad'
}
file_md5
{
'12345abcde'
}
file_md5
{
'12345abcde'
}
...
@@ -196,7 +211,7 @@ FactoryBot.define do
...
@@ -196,7 +211,7 @@ FactoryBot.define do
end
end
end
end
file
{
fixture_file_upload
(
'spec/fixtures/packages/conan/package_files/conan_package.tgz'
)
}
file
_fixture
{
'spec/fixtures/packages/conan/package_files/conan_package.tgz'
}
file_name
{
'conan_package.tgz'
}
file_name
{
'conan_package.tgz'
}
file_sha1
{
'be93151dc23ac34a82752444556fe79b32c7a1ad'
}
file_sha1
{
'be93151dc23ac34a82752444556fe79b32c7a1ad'
}
file_md5
{
'12345abcde'
}
file_md5
{
'12345abcde'
}
...
@@ -205,28 +220,28 @@ FactoryBot.define do
...
@@ -205,28 +220,28 @@ FactoryBot.define do
end
end
trait
(
:jar
)
do
trait
(
:jar
)
do
file
{
fixture_file_upload
(
'spec/fixtures/packages/maven/my-app-1.0-20180724.124855-1.jar'
)
}
file
_fixture
{
'spec/fixtures/packages/maven/my-app-1.0-20180724.124855-1.jar'
}
file_name
{
'my-app-1.0-20180724.124855-1.jar'
}
file_name
{
'my-app-1.0-20180724.124855-1.jar'
}
file_sha1
{
'4f0bfa298744d505383fbb57c554d4f5c12d88b3'
}
file_sha1
{
'4f0bfa298744d505383fbb57c554d4f5c12d88b3'
}
size
{
100
.
kilobytes
}
size
{
100
.
kilobytes
}
end
end
trait
(
:pom
)
do
trait
(
:pom
)
do
file
{
fixture_file_upload
(
'spec/fixtures/packages/maven/my-app-1.0-20180724.124855-1.pom'
)
}
file
_fixture
{
'spec/fixtures/packages/maven/my-app-1.0-20180724.124855-1.pom'
}
file_name
{
'my-app-1.0-20180724.124855-1.pom'
}
file_name
{
'my-app-1.0-20180724.124855-1.pom'
}
file_sha1
{
'19c975abd49e5102ca6c74a619f21e0cf0351c57'
}
file_sha1
{
'19c975abd49e5102ca6c74a619f21e0cf0351c57'
}
size
{
200
.
kilobytes
}
size
{
200
.
kilobytes
}
end
end
trait
(
:xml
)
do
trait
(
:xml
)
do
file
{
fixture_file_upload
(
'spec/fixtures/packages/maven/maven-metadata.xml'
)
}
file
_fixture
{
'spec/fixtures/packages/maven/maven-metadata.xml'
}
file_name
{
'maven-metadata.xml'
}
file_name
{
'maven-metadata.xml'
}
file_sha1
{
'42b1bdc80de64953b6876f5a8c644f20204011b0'
}
file_sha1
{
'42b1bdc80de64953b6876f5a8c644f20204011b0'
}
size
{
300
.
kilobytes
}
size
{
300
.
kilobytes
}
end
end
trait
(
:npm
)
do
trait
(
:npm
)
do
file
{
fixture_file_upload
(
'spec/fixtures/packages/npm/foo-1.0.1.tgz'
)
}
file
_fixture
{
'spec/fixtures/packages/npm/foo-1.0.1.tgz'
}
file_name
{
'foo-1.0.1.tgz'
}
file_name
{
'foo-1.0.1.tgz'
}
file_sha1
{
'be93151dc23ac34a82752444556fe79b32c7a1ad'
}
file_sha1
{
'be93151dc23ac34a82752444556fe79b32c7a1ad'
}
verified_at
{
Date
.
current
}
verified_at
{
Date
.
current
}
...
@@ -236,7 +251,7 @@ FactoryBot.define do
...
@@ -236,7 +251,7 @@ FactoryBot.define do
trait
(
:nuget
)
do
trait
(
:nuget
)
do
package
package
file
{
fixture_file_upload
(
'spec/fixtures/packages/nuget/package.nupkg'
)
}
file
_fixture
{
'spec/fixtures/packages/nuget/package.nupkg'
}
file_name
{
'package.nupkg'
}
file_name
{
'package.nupkg'
}
file_sha1
{
'5fe852b2a6abd96c22c11fa1ff2fb19d9ce58b57'
}
file_sha1
{
'5fe852b2a6abd96c22c11fa1ff2fb19d9ce58b57'
}
size
{
300
.
kilobytes
}
size
{
300
.
kilobytes
}
...
@@ -244,7 +259,7 @@ FactoryBot.define do
...
@@ -244,7 +259,7 @@ FactoryBot.define do
trait
(
:pypi
)
do
trait
(
:pypi
)
do
package
package
file
{
fixture_file_upload
(
'spec/fixtures/packages/pypi/sample-project.tar.gz'
)
}
file
_fixture
{
'spec/fixtures/packages/pypi/sample-project.tar.gz'
}
file_name
{
'sample-project-1.0.0.tar.gz'
}
file_name
{
'sample-project-1.0.0.tar.gz'
}
file_sha1
{
'2c0cfbed075d3fae226f051f0cc771b533e01aff'
}
file_sha1
{
'2c0cfbed075d3fae226f051f0cc771b533e01aff'
}
file_md5
{
'0a7392d24f42f83068fa3767c5310052'
}
file_md5
{
'0a7392d24f42f83068fa3767c5310052'
}
...
@@ -297,6 +312,7 @@ FactoryBot.define do
...
@@ -297,6 +312,7 @@ FactoryBot.define do
factory
:conan_file_metadatum
,
class:
'Packages::Conan::FileMetadatum'
do
factory
:conan_file_metadatum
,
class:
'Packages::Conan::FileMetadatum'
do
package_file
{
create
(
:conan_package_file
,
:conan_recipe_file
,
without_loaded_metadatum:
true
)
}
package_file
{
create
(
:conan_package_file
,
:conan_recipe_file
,
without_loaded_metadatum:
true
)
}
recipe_revision
{
'0'
}
recipe_revision
{
'0'
}
conan_file_type
{
'recipe_file'
}
trait
(
:recipe_file
)
do
trait
(
:recipe_file
)
do
conan_file_type
{
'recipe_file'
}
conan_file_type
{
'recipe_file'
}
...
@@ -316,7 +332,7 @@ FactoryBot.define do
...
@@ -316,7 +332,7 @@ FactoryBot.define do
end
end
factory
:packages_dependency_link
,
class:
'Packages::DependencyLink'
do
factory
:packages_dependency_link
,
class:
'Packages::DependencyLink'
do
package
package
{
create
(
:nuget_package
)
}
dependency
{
create
(
:packages_dependency
)
}
dependency
{
create
(
:packages_dependency
)
}
dependency_type
{
:dependencies
}
dependency_type
{
:dependencies
}
...
@@ -328,6 +344,7 @@ FactoryBot.define do
...
@@ -328,6 +344,7 @@ FactoryBot.define do
end
end
factory
:nuget_dependency_link_metadatum
,
class:
'Packages::Nuget::DependencyLinkMetadatum'
do
factory
:nuget_dependency_link_metadatum
,
class:
'Packages::Nuget::DependencyLinkMetadatum'
do
dependency_link
{
create
(
:packages_dependency_link
)
}
target_framework
{
'.NETStandard2.0'
}
target_framework
{
'.NETStandard2.0'
}
end
end
...
...
ee/spec/models/packages/package_file_spec.rb
View file @
4e1f7cf8
...
@@ -52,7 +52,7 @@ RSpec.describe Packages::PackageFile, type: :model do
...
@@ -52,7 +52,7 @@ RSpec.describe Packages::PackageFile, type: :model do
end
end
describe
'#update_file_metadata callback'
do
describe
'#update_file_metadata callback'
do
let
(
:package_file
)
{
build
(
:package_file
,
:nuget
,
file_store:
0
,
size:
nil
)
}
let
_it_be
(
:package_file
)
{
build
(
:package_file
,
:nuget
,
file_store:
nil
,
size:
nil
)
}
subject
{
package_file
.
save!
}
subject
{
package_file
.
save!
}
...
@@ -61,10 +61,9 @@ RSpec.describe Packages::PackageFile, type: :model do
...
@@ -61,10 +61,9 @@ RSpec.describe Packages::PackageFile, type: :model do
.
to
receive
(
:update_file_metadata
)
.
to
receive
(
:update_file_metadata
)
.
and_call_original
.
and_call_original
subject
expect
{
subject
}
.
to
change
{
package_file
.
file_store
}.
from
(
nil
).
to
(
::
Packages
::
PackageFileUploader
::
Store
::
LOCAL
)
expect
(
package_file
.
file_store
).
to
eq
1
.
and
change
{
package_file
.
size
}.
from
(
nil
).
to
(
3513
)
expect
(
package_file
.
size
).
to
eq
3513
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