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
5c60d04a
Commit
5c60d04a
authored
Jun 26, 2020
by
Ash McKenzie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Merge branch '221259-improve-package-factories' into 'master'"
This reverts merge request !35128
parent
f4eb0c8d
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
14 deletions
+1
-14
ee/spec/factories/packages.rb
ee/spec/factories/packages.rb
+1
-14
No files found.
ee/spec/factories/packages.rb
View file @
5c60d04a
...
@@ -118,25 +118,14 @@ FactoryBot.define do
...
@@ -118,25 +118,14 @@ 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
{
fixture_file_upload
(
'spec/fixtures/packages/conan/recipe_files/conanfile.py'
)
}
file_name
{
'conanfile.py'
}
file_sha1
{
'be93151dc23ac34a82752444556fe79b32c7a1ad'
}
file_md5
{
'12345abcde'
}
size
{
400
.
kilobytes
}
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
)
}
...
@@ -308,7 +297,6 @@ FactoryBot.define do
...
@@ -308,7 +297,6 @@ 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'
}
...
@@ -328,7 +316,7 @@ FactoryBot.define do
...
@@ -328,7 +316,7 @@ FactoryBot.define do
end
end
factory
:packages_dependency_link
,
class:
'Packages::DependencyLink'
do
factory
:packages_dependency_link
,
class:
'Packages::DependencyLink'
do
package
{
create
(
:nuget_package
)
}
package
dependency
{
create
(
:packages_dependency
)
}
dependency
{
create
(
:packages_dependency
)
}
dependency_type
{
:dependencies
}
dependency_type
{
:dependencies
}
...
@@ -340,7 +328,6 @@ FactoryBot.define do
...
@@ -340,7 +328,6 @@ 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
...
...
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