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
f81df0d4
Commit
f81df0d4
authored
Aug 02, 2017
by
Robert Speicher
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove EE-specific usages of `:empty_project`
parent
17f36d4b
Changes
111
Show whitespace changes
Inline
Side-by-side
Showing
111 changed files
with
214 additions
and
214 deletions
+214
-214
features/steps/group_hooks.rb
features/steps/group_hooks.rb
+2
-2
features/steps/project/elastic/project_search.rb
features/steps/project/elastic/project_search.rb
+1
-1
spec/controllers/ee/projects/boards_controller_spec.rb
spec/controllers/ee/projects/boards_controller_spec.rb
+1
-1
spec/controllers/ee/projects_controller_spec.rb
spec/controllers/ee/projects_controller_spec.rb
+1
-1
spec/controllers/projects/approver_groups_controller_spec.rb
spec/controllers/projects/approver_groups_controller_spec.rb
+1
-1
spec/controllers/projects/approvers_controller_spec.rb
spec/controllers/projects/approvers_controller_spec.rb
+1
-1
spec/controllers/projects/issues_controller_ee_spec.rb
spec/controllers/projects/issues_controller_ee_spec.rb
+1
-1
spec/controllers/projects/merge_requests/creations_controller_ee_spec.rb
...s/projects/merge_requests/creations_controller_ee_spec.rb
+1
-1
spec/controllers/projects/mirrors_controller_spec.rb
spec/controllers/projects/mirrors_controller_spec.rb
+3
-3
spec/controllers/projects/push_rules_controller_spec.rb
spec/controllers/projects/push_rules_controller_spec.rb
+1
-1
spec/controllers/projects/settings/slacks_controller_spec.rb
spec/controllers/projects/settings/slacks_controller_spec.rb
+1
-1
spec/factories/audit_events.rb
spec/factories/audit_events.rb
+1
-1
spec/factories/forked_project_links.rb
spec/factories/forked_project_links.rb
+1
-1
spec/factories/geo/event_log.rb
spec/factories/geo/event_log.rb
+1
-1
spec/factories/geo/project_registry.rb
spec/factories/geo/project_registry.rb
+1
-1
spec/factories/services.rb
spec/factories/services.rb
+1
-1
spec/features/admin/admin_emails_spec.rb
spec/features/admin/admin_emails_spec.rb
+1
-1
spec/features/admin/admin_users_spec.rb
spec/features/admin/admin_users_spec.rb
+3
-3
spec/features/boards/board_with_milestone_spec.rb
spec/features/boards/board_with_milestone_spec.rb
+1
-1
spec/features/boards/ee/boards_spec.rb
spec/features/boards/ee/boards_spec.rb
+1
-1
spec/features/boards/ee/sidebar_spec.rb
spec/features/boards/ee/sidebar_spec.rb
+1
-1
spec/features/boards/multiple_boards_spec.rb
spec/features/boards/multiple_boards_spec.rb
+1
-1
spec/features/ci_shared_runner_settings_spec.rb
spec/features/ci_shared_runner_settings_spec.rb
+1
-1
spec/features/groups/analytics_spec.rb
spec/features/groups/analytics_spec.rb
+1
-1
spec/features/groups/members/override_ldap_memberships_spec.rb
...features/groups/members/override_ldap_memberships_spec.rb
+1
-1
spec/features/groups/pipeline_quota_spec.rb
spec/features/groups/pipeline_quota_spec.rb
+3
-3
spec/features/issues/csv_spec.rb
spec/features/issues/csv_spec.rb
+1
-1
spec/features/issues/ee/form_spec.rb
spec/features/issues/ee/form_spec.rb
+1
-1
spec/features/issues/filtered_search/dropdown_weight_spec.rb
spec/features/issues/filtered_search/dropdown_weight_spec.rb
+1
-1
spec/features/issues/filtered_search/filter_issues_weight_spec.rb
...tures/issues/filtered_search/filter_issues_weight_spec.rb
+1
-1
spec/features/issues/sub_nav_ee_spec.rb
spec/features/issues/sub_nav_ee_spec.rb
+1
-1
spec/features/profiles/pipeline_quota_spec.rb
spec/features/profiles/pipeline_quota_spec.rb
+3
-3
spec/features/projects/ee/geo_clone_instructions_spec.rb
spec/features/projects/ee/geo_clone_instructions_spec.rb
+1
-1
spec/features/projects/members/member_is_removed_from_project_spec.rb
...s/projects/members/member_is_removed_from_project_spec.rb
+1
-1
spec/features/projects/milestones/ee/milestone_spec.rb
spec/features/projects/milestones/ee/milestone_spec.rb
+1
-1
spec/features/projects/settings/ee/issues_settings_spec.rb
spec/features/projects/settings/ee/issues_settings_spec.rb
+1
-1
spec/features/projects/settings/ee/merge_requests_settings_spec.rb
...ures/projects/settings/ee/merge_requests_settings_spec.rb
+1
-1
spec/features/projects/settings/slack_application_spec.rb
spec/features/projects/settings/slack_application_spec.rb
+1
-1
spec/features/variables_ee_spec.rb
spec/features/variables_ee_spec.rb
+1
-1
spec/helpers/ee/gitlab_routing_helper_spec.rb
spec/helpers/ee/gitlab_routing_helper_spec.rb
+1
-1
spec/lib/audit/details_spec.rb
spec/lib/audit/details_spec.rb
+1
-1
spec/lib/ee/gitlab/ldap/sync/group_spec.rb
spec/lib/ee/gitlab/ldap/sync/group_spec.rb
+1
-1
spec/lib/gitlab/elastic/indexer_spec.rb
spec/lib/gitlab/elastic/indexer_spec.rb
+1
-1
spec/lib/gitlab/elastic/project_search_results_spec.rb
spec/lib/gitlab/elastic/project_search_results_spec.rb
+2
-2
spec/lib/gitlab/elastic/search_results_spec.rb
spec/lib/gitlab/elastic/search_results_spec.rb
+2
-2
spec/lib/gitlab/email/handler/ee/service_desk_handler_spec.rb
.../lib/gitlab/email/handler/ee/service_desk_handler_spec.rb
+2
-2
spec/lib/gitlab/path_locks_finder_spec.rb
spec/lib/gitlab/path_locks_finder_spec.rb
+1
-1
spec/lib/gitlab/repository_size_error_spec.rb
spec/lib/gitlab/repository_size_error_spec.rb
+1
-1
spec/lib/gitlab/usage_data_spec.rb
spec/lib/gitlab/usage_data_spec.rb
+1
-1
spec/mailers/emails/csv_export_spec.rb
spec/mailers/emails/csv_export_spec.rb
+1
-1
spec/models/concerns/elastic/issue_spec.rb
spec/models/concerns/elastic/issue_spec.rb
+1
-1
spec/models/concerns/elastic/milestone_spec.rb
spec/models/concerns/elastic/milestone_spec.rb
+1
-1
spec/models/concerns/elastic/project_spec.rb
spec/models/concerns/elastic/project_spec.rb
+7
-7
spec/models/concerns/elastic/project_wiki_spec.rb
spec/models/concerns/elastic/project_wiki_spec.rb
+1
-1
spec/models/concerns/elastic/snippet_spec.rb
spec/models/concerns/elastic/snippet_spec.rb
+1
-1
spec/models/ee/namespace_spec.rb
spec/models/ee/namespace_spec.rb
+4
-4
spec/models/ee/project_spec.rb
spec/models/ee/project_spec.rb
+22
-22
spec/models/geo/project_registry_spec.rb
spec/models/geo/project_registry_spec.rb
+1
-1
spec/models/issue_spec.rb
spec/models/issue_spec.rb
+2
-2
spec/models/merge_request_spec.rb
spec/models/merge_request_spec.rb
+6
-6
spec/models/project_mirror_data_spec.rb
spec/models/project_mirror_data_spec.rb
+4
-4
spec/models/project_services/jenkins_deprecated_service_spec.rb
...odels/project_services/jenkins_deprecated_service_spec.rb
+2
-2
spec/models/project_services/jenkins_service_spec.rb
spec/models/project_services/jenkins_service_spec.rb
+5
-5
spec/models/project_spec.rb
spec/models/project_spec.rb
+26
-26
spec/policies/ee/merge_request_policy_spec.rb
spec/policies/ee/merge_request_policy_spec.rb
+2
-2
spec/requests/api/ee/issues_spec.rb
spec/requests/api/ee/issues_spec.rb
+1
-1
spec/requests/api/geo_spec.rb
spec/requests/api/geo_spec.rb
+1
-1
spec/requests/api/issue_links_spec.rb
spec/requests/api/issue_links_spec.rb
+7
-7
spec/requests/api/members_spec.rb
spec/requests/api/members_spec.rb
+1
-1
spec/requests/api/variables_ee_spec.rb
spec/requests/api/variables_ee_spec.rb
+1
-1
spec/routing/webhook_routes_spec.rb
spec/routing/webhook_routes_spec.rb
+1
-1
spec/services/audit_event_service_spec.rb
spec/services/audit_event_service_spec.rb
+1
-1
spec/services/boards/destroy_service_spec.rb
spec/services/boards/destroy_service_spec.rb
+1
-1
spec/services/boards/update_service_spec.rb
spec/services/boards/update_service_spec.rb
+1
-1
spec/services/ee/boards/create_service_spec.rb
spec/services/ee/boards/create_service_spec.rb
+1
-1
spec/services/ee/boards/list_service_spec.rb
spec/services/ee/boards/list_service_spec.rb
+1
-1
spec/services/ee/ci/register_job_service_spec.rb
spec/services/ee/ci/register_job_service_spec.rb
+1
-1
spec/services/ee/issues/build_service_spec.rb
spec/services/ee/issues/build_service_spec.rb
+1
-1
spec/services/ee/merge_requests/build_service_spec.rb
spec/services/ee/merge_requests/build_service_spec.rb
+1
-1
spec/services/ee/quick_actions/interpret_service_spec.rb
spec/services/ee/quick_actions/interpret_service_spec.rb
+1
-1
spec/services/ee/wiki_pages/create_service_spec.rb
spec/services/ee/wiki_pages/create_service_spec.rb
+1
-1
spec/services/ee/wiki_pages/destroy_service_spec.rb
spec/services/ee/wiki_pages/destroy_service_spec.rb
+1
-1
spec/services/ee/wiki_pages/update_service_spec.rb
spec/services/ee/wiki_pages/update_service_spec.rb
+1
-1
spec/services/geo/file_download_service_spec.rb
spec/services/geo/file_download_service_spec.rb
+2
-2
spec/services/geo/file_upload_service_spec.rb
spec/services/geo/file_upload_service_spec.rb
+2
-2
spec/services/geo/repository_deleted_event_store_spec.rb
spec/services/geo/repository_deleted_event_store_spec.rb
+1
-1
spec/services/geo/repository_renamed_event_store_spec.rb
spec/services/geo/repository_renamed_event_store_spec.rb
+1
-1
spec/services/geo/repository_update_service_spec.rb
spec/services/geo/repository_update_service_spec.rb
+1
-1
spec/services/issue_links/create_service_spec.rb
spec/services/issue_links/create_service_spec.rb
+2
-2
spec/services/issue_links/destroy_service_spec.rb
spec/services/issue_links/destroy_service_spec.rb
+2
-2
spec/services/issue_links/list_service_spec.rb
spec/services/issue_links/list_service_spec.rb
+4
-4
spec/services/issues/export_csv_service_spec.rb
spec/services/issues/export_csv_service_spec.rb
+1
-1
spec/services/path_locks/lock_service_spec.rb
spec/services/path_locks/lock_service_spec.rb
+1
-1
spec/services/projects/slack_application_install_service_spec.rb
...rvices/projects/slack_application_install_service_spec.rb
+1
-1
spec/services/projects/update_mirror_service_spec.rb
spec/services/projects/update_mirror_service_spec.rb
+1
-1
spec/services/projects/update_service_spec.rb
spec/services/projects/update_service_spec.rb
+1
-1
spec/services/slash_commands/global_slack_handler_spec.rb
spec/services/slash_commands/global_slack_handler_spec.rb
+1
-1
spec/services/update_build_minutes_service_spec.rb
spec/services/update_build_minutes_service_spec.rb
+1
-1
spec/services/users/destroy_service_spec.rb
spec/services/users/destroy_service_spec.rb
+1
-1
spec/views/shared/issuable/_approvals.html.haml_spec.rb
spec/views/shared/issuable/_approvals.html.haml_spec.rb
+1
-1
spec/workers/admin_emails_worker_spec.rb
spec/workers/admin_emails_worker_spec.rb
+1
-1
spec/workers/clear_shared_runners_minutes_worker_spec.rb
spec/workers/clear_shared_runners_minutes_worker_spec.rb
+1
-1
spec/workers/elastic_batch_project_indexer_worker_spec.rb
spec/workers/elastic_batch_project_indexer_worker_spec.rb
+1
-1
spec/workers/elastic_indexer_worker_spec.rb
spec/workers/elastic_indexer_worker_spec.rb
+2
-2
spec/workers/export_csv_worker_spec.rb
spec/workers/export_csv_worker_spec.rb
+1
-1
spec/workers/geo/project_sync_worker_spec.rb
spec/workers/geo/project_sync_worker_spec.rb
+1
-1
spec/workers/geo/repository_sync_worker_spec.rb
spec/workers/geo/repository_sync_worker_spec.rb
+2
-2
spec/workers/geo_repository_fetch_worker_spec.rb
spec/workers/geo_repository_fetch_worker_spec.rb
+1
-1
spec/workers/repository_import_worker_spec.rb
spec/workers/repository_import_worker_spec.rb
+1
-1
spec/workers/repository_update_mirror_worker_spec.rb
spec/workers/repository_update_mirror_worker_spec.rb
+1
-1
spec/workers/update_all_mirrors_worker_spec.rb
spec/workers/update_all_mirrors_worker_spec.rb
+7
-7
No files found.
features/steps/group_hooks.rb
View file @
f81df0d4
...
@@ -14,12 +14,12 @@ class Spinach::Features::GroupHooks < Spinach::FeatureSteps
...
@@ -14,12 +14,12 @@ class Spinach::Features::GroupHooks < Spinach::FeatureSteps
end
end
step
'I own project "Shop" in group "Sourcing"'
do
step
'I own project "Shop" in group "Sourcing"'
do
@project
=
create
(
:project
,
@project
=
create
(
:project
,
:repository
,
name:
'Shop'
,
group:
@group
)
name:
'Shop'
,
group:
@group
)
end
end
step
'I own empty project "Empty Shop" in group "Sourcing"'
do
step
'I own empty project "Empty Shop" in group "Sourcing"'
do
@project
=
create
(
:
empty_
project
,
@project
=
create
(
:project
,
name:
'Shop'
,
group:
@group
)
name:
'Shop'
,
group:
@group
)
end
end
...
...
features/steps/project/elastic/project_search.rb
View file @
f81df0d4
...
@@ -16,7 +16,7 @@ class Spinach::Features::ProjectSearch < Spinach::FeatureSteps
...
@@ -16,7 +16,7 @@ class Spinach::Features::ProjectSearch < Spinach::FeatureSteps
end
end
step
'project has all data available for the search'
do
step
'project has all data available for the search'
do
@project
=
create
:project
@project
=
create
:project
,
:repository
@project
.
team
<<
[
current_user
,
:master
]
@project
.
team
<<
[
current_user
,
:master
]
@issue
=
create
:issue
,
title:
'bla-bla initial'
,
project:
@project
@issue
=
create
:issue
,
title:
'bla-bla initial'
,
project:
@project
...
...
spec/controllers/ee/projects/boards_controller_spec.rb
View file @
f81df0d4
require
'spec_helper'
require
'spec_helper'
describe
Projects
::
BoardsController
do
# rubocop:disable RSpec/FilePath
describe
Projects
::
BoardsController
do
# rubocop:disable RSpec/FilePath
let
(
:project
)
{
create
(
:
empty_
project
)
}
let
(
:project
)
{
create
(
:project
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
before
do
before
do
...
...
spec/controllers/ee/projects_controller_spec.rb
View file @
f81df0d4
require
(
'spec_helper'
)
require
(
'spec_helper'
)
describe
ProjectsController
do
# rubocop:disable RSpec/FilePath
describe
ProjectsController
do
# rubocop:disable RSpec/FilePath
let
(
:project
)
{
create
(
:
empty_
project
)
}
let
(
:project
)
{
create
(
:project
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
before
do
before
do
...
...
spec/controllers/projects/approver_groups_controller_spec.rb
View file @
f81df0d4
...
@@ -3,7 +3,7 @@ require 'rails_helper'
...
@@ -3,7 +3,7 @@ require 'rails_helper'
describe
Projects
::
ApproverGroupsController
do
describe
Projects
::
ApproverGroupsController
do
describe
'#destroy'
do
describe
'#destroy'
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:project
)
{
create
(
:
empty_
project
)
}
let
(
:project
)
{
create
(
:project
)
}
let
(
:merge_request
)
{
create
(
:merge_request
,
source_project:
project
)
}
let
(
:merge_request
)
{
create
(
:merge_request
,
source_project:
project
)
}
before
do
before
do
...
...
spec/controllers/projects/approvers_controller_spec.rb
View file @
f81df0d4
...
@@ -3,7 +3,7 @@ require 'rails_helper'
...
@@ -3,7 +3,7 @@ require 'rails_helper'
describe
Projects
::
ApproversController
do
describe
Projects
::
ApproversController
do
describe
'#destroy'
do
describe
'#destroy'
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:project
)
{
create
(
:
empty_
project
)
}
let
(
:project
)
{
create
(
:project
)
}
let
(
:merge_request
)
{
create
(
:merge_request
,
source_project:
project
)
}
let
(
:merge_request
)
{
create
(
:merge_request
,
source_project:
project
)
}
before
do
before
do
...
...
spec/controllers/projects/issues_controller_ee_spec.rb
View file @
f81df0d4
...
@@ -78,7 +78,7 @@ describe Projects::IssuesController do
...
@@ -78,7 +78,7 @@ describe Projects::IssuesController do
end
end
describe
'issue weights'
do
describe
'issue weights'
do
let
(
:project
)
{
create
(
:
empty_
project
)
}
let
(
:project
)
{
create
(
:project
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:issue
)
{
create
(
:issue
,
project:
project
,
weight:
5
)
}
let
(
:issue
)
{
create
(
:issue
,
project:
project
,
weight:
5
)
}
let
(
:issue2
)
{
create
(
:issue
,
project:
project
,
weight:
1
)
}
let
(
:issue2
)
{
create
(
:issue
,
project:
project
,
weight:
1
)
}
...
...
spec/controllers/projects/merge_requests/creations_controller_ee_spec.rb
View file @
f81df0d4
...
@@ -80,7 +80,7 @@ describe Projects::MergeRequests::CreationsController do
...
@@ -80,7 +80,7 @@ describe Projects::MergeRequests::CreationsController do
context
'when the target project is a fork of a deleted project'
do
context
'when the target project is a fork of a deleted project'
do
before
do
before
do
original_project
=
create
(
:
empty_
project
)
original_project
=
create
(
:project
)
project
.
update_attributes
(
forked_from_project:
original_project
,
approvals_before_merge:
4
)
project
.
update_attributes
(
forked_from_project:
original_project
,
approvals_before_merge:
4
)
original_project
.
update_attributes
(
pending_delete:
true
)
original_project
.
update_attributes
(
pending_delete:
true
)
...
...
spec/controllers/projects/mirrors_controller_spec.rb
View file @
f81df0d4
...
@@ -95,7 +95,7 @@ describe Projects::MirrorsController do
...
@@ -95,7 +95,7 @@ describe Projects::MirrorsController do
end
end
context
'when project does not have a mirror'
do
context
'when project does not have a mirror'
do
let
(
:project
)
{
create
(
:
empty_
project
)
}
let
(
:project
)
{
create
(
:project
)
}
it
'allows to create a mirror'
do
it
'allows to create a mirror'
do
expect_any_instance_of
(
EE
::
Project
).
to
receive
(
:force_import_job!
)
expect_any_instance_of
(
EE
::
Project
).
to
receive
(
:force_import_job!
)
...
@@ -107,7 +107,7 @@ describe Projects::MirrorsController do
...
@@ -107,7 +107,7 @@ describe Projects::MirrorsController do
end
end
context
'when project has a mirror'
do
context
'when project has a mirror'
do
let
(
:project
)
{
create
(
:
empty_
project
,
:mirror
,
:import_finished
)
}
let
(
:project
)
{
create
(
:project
,
:mirror
,
:import_finished
)
}
it
'is able to disable the mirror'
do
it
'is able to disable the mirror'
do
expect
{
do_put
(
project
,
mirror:
false
)
}.
to
change
{
Project
.
mirror
.
count
}.
to
(
0
)
expect
{
do_put
(
project
,
mirror:
false
)
}.
to
change
{
Project
.
mirror
.
count
}.
to
(
0
)
...
@@ -119,7 +119,7 @@ describe Projects::MirrorsController do
...
@@ -119,7 +119,7 @@ describe Projects::MirrorsController do
it
'forces update'
do
it
'forces update'
do
expect_any_instance_of
(
EE
::
Project
).
to
receive
(
:force_import_job!
)
expect_any_instance_of
(
EE
::
Project
).
to
receive
(
:force_import_job!
)
project
=
create
(
:
empty_
project
,
:mirror
)
project
=
create
(
:project
,
:mirror
)
sign_in
(
project
.
owner
)
sign_in
(
project
.
owner
)
put
:update_now
,
{
namespace_id:
project
.
namespace
.
to_param
,
project_id:
project
.
to_param
}
put
:update_now
,
{
namespace_id:
project
.
namespace
.
to_param
,
project_id:
project
.
to_param
}
...
...
spec/controllers/projects/push_rules_controller_spec.rb
View file @
f81df0d4
require
'spec_helper'
require
'spec_helper'
describe
Projects
::
PushRulesController
do
describe
Projects
::
PushRulesController
do
let
(
:project
)
{
create
(
:
empty_
project
,
push_rule:
create
(
:push_rule
,
prevent_secrets:
false
))
}
let
(
:project
)
{
create
(
:project
,
push_rule:
create
(
:push_rule
,
prevent_secrets:
false
))
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
before
do
before
do
...
...
spec/controllers/projects/settings/slacks_controller_spec.rb
View file @
f81df0d4
require
'spec_helper'
require
'spec_helper'
describe
Projects
::
Settings
::
SlacksController
do
describe
Projects
::
Settings
::
SlacksController
do
let
(
:project
)
{
create
(
:
empty_
project
,
:public
)
}
let
(
:project
)
{
create
(
:project
,
:public
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
before
do
before
do
...
...
spec/factories/audit_events.rb
View file @
f81df0d4
...
@@ -8,7 +8,7 @@ FactoryGirl.define do
...
@@ -8,7 +8,7 @@ FactoryGirl.define do
trait
:project_event
do
trait
:project_event
do
entity_type
'Project'
entity_type
'Project'
entity_id
{
create
(
:
empty_
project
).
id
}
entity_id
{
create
(
:project
).
id
}
end
end
trait
:group_event
do
trait
:group_event
do
...
...
spec/factories/forked_project_links.rb
View file @
f81df0d4
...
@@ -9,7 +9,7 @@ FactoryGirl.define do
...
@@ -9,7 +9,7 @@ FactoryGirl.define do
end
end
trait
:forked_to_empty_project
do
trait
:forked_to_empty_project
do
association
:forked_to_project
,
factory:
[
:project
,
:repository
]
association
:forked_to_project
,
factory:
:project
end
end
end
end
end
end
spec/factories/geo/event_log.rb
View file @
f81df0d4
...
@@ -7,6 +7,6 @@ FactoryGirl.define do
...
@@ -7,6 +7,6 @@ FactoryGirl.define do
source
0
source
0
branches_affected
0
branches_affected
0
tags_affected
0
tags_affected
0
project
factory: :empty_project
project
end
end
end
end
spec/factories/geo/project_registry.rb
View file @
f81df0d4
FactoryGirl
.
define
do
FactoryGirl
.
define
do
factory
:geo_project_registry
,
class:
Geo
::
ProjectRegistry
do
factory
:geo_project_registry
,
class:
Geo
::
ProjectRegistry
do
project
factory: :empty_project
project
last_repository_synced_at
nil
last_repository_synced_at
nil
last_repository_successful_sync_at
nil
last_repository_successful_sync_at
nil
last_wiki_synced_at
nil
last_wiki_synced_at
nil
...
...
spec/factories/services.rb
View file @
f81df0d4
...
@@ -49,7 +49,7 @@ FactoryGirl.define do
...
@@ -49,7 +49,7 @@ FactoryGirl.define do
end
end
factory
:gitlab_slack_application_service
do
factory
:gitlab_slack_application_service
do
project
factory: :empty_project
project
type
'GitlabSlackApplicationService'
type
'GitlabSlackApplicationService'
end
end
end
end
spec/features/admin/admin_emails_spec.rb
View file @
f81df0d4
...
@@ -3,7 +3,7 @@ require 'spec_helper'
...
@@ -3,7 +3,7 @@ require 'spec_helper'
describe
"Admin::Emails"
,
:js
do
describe
"Admin::Emails"
,
:js
do
let!
(
:current_user
)
{
create
(
:admin
)
}
let!
(
:current_user
)
{
create
(
:admin
)
}
let!
(
:group
)
{
create
(
:group
)
}
let!
(
:group
)
{
create
(
:group
)
}
let!
(
:project
)
{
create
(
:
empty_
project
,
namespace:
group
)
}
let!
(
:project
)
{
create
(
:project
,
namespace:
group
)
}
describe
"GET /admin/email"
do
describe
"GET /admin/email"
do
before
do
before
do
...
...
spec/features/admin/admin_users_spec.rb
View file @
f81df0d4
...
@@ -213,7 +213,7 @@ describe "Admin::Users" do
...
@@ -213,7 +213,7 @@ describe "Admin::Users" do
context
'with projects with shared runners enabled'
do
context
'with projects with shared runners enabled'
do
before
do
before
do
create
(
:
empty_
project
,
namespace:
user
.
namespace
,
shared_runners_enabled:
true
)
create
(
:project
,
namespace:
user
.
namespace
,
shared_runners_enabled:
true
)
end
end
it
'shows quota'
do
it
'shows quota'
do
...
@@ -227,7 +227,7 @@ describe "Admin::Users" do
...
@@ -227,7 +227,7 @@ describe "Admin::Users" do
context
'without projects with shared runners enabled'
do
context
'without projects with shared runners enabled'
do
before
do
before
do
create
(
:
empty_
project
,
namespace:
user
.
namespace
,
shared_runners_enabled:
false
)
create
(
:project
,
namespace:
user
.
namespace
,
shared_runners_enabled:
false
)
end
end
it
'does not show quota'
do
it
'does not show quota'
do
...
@@ -304,7 +304,7 @@ describe "Admin::Users" do
...
@@ -304,7 +304,7 @@ describe "Admin::Users" do
end
end
describe
'Update shared runners quota'
do
describe
'Update shared runners quota'
do
let!
(
:project
)
{
create
(
:
empty_
project
,
namespace:
user
.
namespace
,
shared_runners_enabled:
true
)
}
let!
(
:project
)
{
create
(
:project
,
namespace:
user
.
namespace
,
shared_runners_enabled:
true
)
}
before
do
before
do
fill_in
"user_namespace_attributes_shared_runners_minutes_limit"
,
with:
"500"
fill_in
"user_namespace_attributes_shared_runners_minutes_limit"
,
with:
"500"
...
...
spec/features/boards/board_with_milestone_spec.rb
View file @
f81df0d4
...
@@ -2,7 +2,7 @@ require 'rails_helper'
...
@@ -2,7 +2,7 @@ require 'rails_helper'
describe
'Board with milestone'
,
:js
do
describe
'Board with milestone'
,
:js
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:project
)
{
create
(
:
empty_
project
,
:public
)
}
let
(
:project
)
{
create
(
:project
,
:public
)
}
let!
(
:milestone
)
{
create
(
:milestone
,
project:
project
)
}
let!
(
:milestone
)
{
create
(
:milestone
,
project:
project
)
}
let!
(
:issue
)
{
create
(
:closed_issue
,
project:
project
)
}
let!
(
:issue
)
{
create
(
:closed_issue
,
project:
project
)
}
let!
(
:issue_milestone
)
{
create
(
:closed_issue
,
project:
project
,
milestone:
milestone
)
}
let!
(
:issue_milestone
)
{
create
(
:closed_issue
,
project:
project
,
milestone:
milestone
)
}
...
...
spec/features/boards/ee/boards_spec.rb
View file @
f81df0d4
...
@@ -2,7 +2,7 @@ require 'spec_helper'
...
@@ -2,7 +2,7 @@ require 'spec_helper'
describe
'issue boards'
,
:js
do
describe
'issue boards'
,
:js
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:project
)
{
create
(
:
empty_
project
,
:public
)
}
let
(
:project
)
{
create
(
:project
,
:public
)
}
let!
(
:board
)
{
create
(
:board
,
project:
project
)
}
let!
(
:board
)
{
create
(
:board
,
project:
project
)
}
before
do
before
do
...
...
spec/features/boards/ee/sidebar_spec.rb
View file @
f81df0d4
...
@@ -3,7 +3,7 @@ require 'rails_helper'
...
@@ -3,7 +3,7 @@ require 'rails_helper'
describe
'Issue Boards'
,
:js
do
describe
'Issue Boards'
,
:js
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:user2
)
{
create
(
:user
)
}
let
(
:user2
)
{
create
(
:user
)
}
let
(
:project
)
{
create
(
:
empty_
project
,
:public
)
}
let
(
:project
)
{
create
(
:project
,
:public
)
}
let!
(
:milestone
)
{
create
(
:milestone
,
project:
project
)
}
let!
(
:milestone
)
{
create
(
:milestone
,
project:
project
)
}
let!
(
:development
)
{
create
(
:label
,
project:
project
,
name:
'Development'
)
}
let!
(
:development
)
{
create
(
:label
,
project:
project
,
name:
'Development'
)
}
let!
(
:stretch
)
{
create
(
:label
,
project:
project
,
name:
'Stretch'
)
}
let!
(
:stretch
)
{
create
(
:label
,
project:
project
,
name:
'Stretch'
)
}
...
...
spec/features/boards/multiple_boards_spec.rb
View file @
f81df0d4
...
@@ -2,7 +2,7 @@ require 'rails_helper'
...
@@ -2,7 +2,7 @@ require 'rails_helper'
describe
'Multiple Issue Boards'
,
:js
do
describe
'Multiple Issue Boards'
,
:js
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:project
)
{
create
(
:
empty_
project
,
:public
)
}
let
(
:project
)
{
create
(
:project
,
:public
)
}
let!
(
:planning
)
{
create
(
:label
,
project:
project
,
name:
'Planning'
)
}
let!
(
:planning
)
{
create
(
:label
,
project:
project
,
name:
'Planning'
)
}
let!
(
:board
)
{
create
(
:board
,
project:
project
)
}
let!
(
:board
)
{
create
(
:board
,
project:
project
)
}
let!
(
:board2
)
{
create
(
:board
,
project:
project
)
}
let!
(
:board2
)
{
create
(
:board
,
project:
project
)
}
...
...
spec/features/ci_shared_runner_settings_spec.rb
View file @
f81df0d4
...
@@ -5,7 +5,7 @@ feature 'CI shared runner settings' do
...
@@ -5,7 +5,7 @@ feature 'CI shared runner settings' do
let
(
:admin
)
{
create
(
:admin
)
}
let
(
:admin
)
{
create
(
:admin
)
}
let
(
:group
)
{
create
(
:group
,
:with_build_minutes
)
}
let
(
:group
)
{
create
(
:group
,
:with_build_minutes
)
}
let!
(
:project
)
{
create
(
:
empty_
project
,
namespace:
group
,
shared_runners_enabled:
true
)
}
let!
(
:project
)
{
create
(
:project
,
namespace:
group
,
shared_runners_enabled:
true
)
}
before
do
before
do
stub_env
(
'IN_MEMORY_APPLICATION_SETTINGS'
,
'false'
)
stub_env
(
'IN_MEMORY_APPLICATION_SETTINGS'
,
'false'
)
...
...
spec/features/groups/analytics_spec.rb
View file @
f81df0d4
...
@@ -3,7 +3,7 @@ require 'spec_helper'
...
@@ -3,7 +3,7 @@ require 'spec_helper'
feature
'Groups > Contribution Analytics'
,
:js
do
feature
'Groups > Contribution Analytics'
,
:js
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:group
)
{
create
(
:group
)
}
let
(
:group
)
{
create
(
:group
)
}
let
(
:empty_project
)
{
create
(
:
empty_
project
,
namespace:
group
)
}
let
(
:empty_project
)
{
create
(
:project
,
namespace:
group
)
}
before
do
before
do
group
.
add_owner
(
user
)
group
.
add_owner
(
user
)
...
...
spec/features/groups/members/override_ldap_memberships_spec.rb
View file @
f81df0d4
...
@@ -7,7 +7,7 @@ feature 'Groups > Members > Master/Owner can override LDAP access levels' do
...
@@ -7,7 +7,7 @@ feature 'Groups > Members > Master/Owner can override LDAP access levels' do
let
(
:maryjane
)
{
create
(
:user
,
name:
'Mary Jane'
)
}
let
(
:maryjane
)
{
create
(
:user
,
name:
'Mary Jane'
)
}
let
(
:owner
)
{
create
(
:user
)
}
let
(
:owner
)
{
create
(
:user
)
}
let
(
:group
)
{
create
(
:group_with_ldap_group_link
,
:public
)
}
let
(
:group
)
{
create
(
:group_with_ldap_group_link
,
:public
)
}
let
(
:project
)
{
create
(
:
empty_
project
,
namespace:
group
)
}
let
(
:project
)
{
create
(
:project
,
namespace:
group
)
}
let!
(
:owner_member
)
{
create
(
:group_member
,
:owner
,
group:
group
,
user:
owner
)
}
let!
(
:owner_member
)
{
create
(
:group_member
,
:owner
,
group:
group
,
user:
owner
)
}
let!
(
:ldap_member
)
{
create
(
:group_member
,
:guest
,
group:
group
,
user:
johndoe
,
ldap:
true
)
}
let!
(
:ldap_member
)
{
create
(
:group_member
,
:guest
,
group:
group
,
user:
johndoe
,
ldap:
true
)
}
...
...
spec/features/groups/pipeline_quota_spec.rb
View file @
f81df0d4
...
@@ -3,7 +3,7 @@ require 'spec_helper'
...
@@ -3,7 +3,7 @@ require 'spec_helper'
feature
'Groups > Pipeline Quota'
do
feature
'Groups > Pipeline Quota'
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:group
)
{
create
(
:group
)
}
let
(
:group
)
{
create
(
:group
)
}
let!
(
:project
)
{
create
(
:
empty_
project
,
namespace:
group
,
shared_runners_enabled:
true
)
}
let!
(
:project
)
{
create
(
:project
,
namespace:
group
,
shared_runners_enabled:
true
)
}
before
do
before
do
group
.
add_owner
(
user
)
group
.
add_owner
(
user
)
...
@@ -33,7 +33,7 @@ feature 'Groups > Pipeline Quota' do
...
@@ -33,7 +33,7 @@ feature 'Groups > Pipeline Quota' do
context
'with no projects using shared runners'
do
context
'with no projects using shared runners'
do
let
(
:group
)
{
create
(
:group
,
:with_not_used_build_minutes_limit
)
}
let
(
:group
)
{
create
(
:group
,
:with_not_used_build_minutes_limit
)
}
let!
(
:project
)
{
create
(
:
empty_
project
,
namespace:
group
,
shared_runners_enabled:
false
)
}
let!
(
:project
)
{
create
(
:project
,
namespace:
group
,
shared_runners_enabled:
false
)
}
it
'is not linked within the group settings dropdown'
do
it
'is not linked within the group settings dropdown'
do
visit
edit_group_path
(
group
)
visit
edit_group_path
(
group
)
...
@@ -77,7 +77,7 @@ feature 'Groups > Pipeline Quota' do
...
@@ -77,7 +77,7 @@ feature 'Groups > Pipeline Quota' do
context
'minutes over quota'
do
context
'minutes over quota'
do
let
(
:group
)
{
create
(
:group
,
:with_used_build_minutes_limit
)
}
let
(
:group
)
{
create
(
:group
,
:with_used_build_minutes_limit
)
}
let!
(
:other_project
)
{
create
(
:
empty_
project
,
namespace:
group
,
shared_runners_enabled:
false
)
}
let!
(
:other_project
)
{
create
(
:project
,
namespace:
group
,
shared_runners_enabled:
false
)
}
it
'is linked within the group settings tab'
do
it
'is linked within the group settings tab'
do
visit
edit_group_path
(
group
)
visit
edit_group_path
(
group
)
...
...
spec/features/issues/csv_spec.rb
View file @
f81df0d4
...
@@ -2,7 +2,7 @@ require 'spec_helper'
...
@@ -2,7 +2,7 @@ require 'spec_helper'
describe
'Issues csv'
do
describe
'Issues csv'
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:project
)
{
create
(
:
empty_
project
,
:public
)
}
let
(
:project
)
{
create
(
:project
,
:public
)
}
let
(
:milestone
)
{
create
(
:milestone
,
title:
'v1.0'
,
project:
project
)
}
let
(
:milestone
)
{
create
(
:milestone
,
title:
'v1.0'
,
project:
project
)
}
let
(
:idea_label
)
{
create
(
:label
,
project:
project
,
title:
'Idea'
)
}
let
(
:idea_label
)
{
create
(
:label
,
project:
project
,
title:
'Idea'
)
}
let
(
:feature_label
)
{
create
(
:label
,
project:
project
,
title:
'Feature'
)
}
let
(
:feature_label
)
{
create
(
:label
,
project:
project
,
title:
'Feature'
)
}
...
...
spec/features/issues/ee/form_spec.rb
View file @
f81df0d4
...
@@ -5,7 +5,7 @@ describe 'New/edit issue', :js do
...
@@ -5,7 +5,7 @@ describe 'New/edit issue', :js do
include
ActionView
::
Helpers
::
JavaScriptHelper
include
ActionView
::
Helpers
::
JavaScriptHelper
include
FormHelper
include
FormHelper
let!
(
:project
)
{
create
(
:
empty_
project
)
}
let!
(
:project
)
{
create
(
:project
)
}
let!
(
:user
)
{
create
(
:user
)}
let!
(
:user
)
{
create
(
:user
)}
let!
(
:user2
)
{
create
(
:user
)}
let!
(
:user2
)
{
create
(
:user
)}
let!
(
:milestone
)
{
create
(
:milestone
,
project:
project
)
}
let!
(
:milestone
)
{
create
(
:milestone
,
project:
project
)
}
...
...
spec/features/issues/filtered_search/dropdown_weight_spec.rb
View file @
f81df0d4
...
@@ -3,7 +3,7 @@ require 'rails_helper'
...
@@ -3,7 +3,7 @@ require 'rails_helper'
describe
'Dropdown weight'
,
:js
do
describe
'Dropdown weight'
,
:js
do
include
FilteredSearchHelpers
include
FilteredSearchHelpers
let!
(
:project
)
{
create
(
:
empty_
project
)
}
let!
(
:project
)
{
create
(
:project
)
}
let!
(
:user
)
{
create
(
:user
)
}
let!
(
:user
)
{
create
(
:user
)
}
let
(
:filtered_search
)
{
find
(
'.filtered-search'
)
}
let
(
:filtered_search
)
{
find
(
'.filtered-search'
)
}
let
(
:js_dropdown_weight
)
{
'#js-dropdown-weight'
}
let
(
:js_dropdown_weight
)
{
'#js-dropdown-weight'
}
...
...
spec/features/issues/filtered_search/filter_issues_weight_spec.rb
View file @
f81df0d4
...
@@ -3,7 +3,7 @@ require 'rails_helper'
...
@@ -3,7 +3,7 @@ require 'rails_helper'
describe
'Filter issues weight'
,
:js
do
describe
'Filter issues weight'
,
:js
do
include
FilteredSearchHelpers
include
FilteredSearchHelpers
let!
(
:project
)
{
create
(
:
empty_
project
)
}
let!
(
:project
)
{
create
(
:project
)
}
let!
(
:user
)
{
create
(
:user
,
name:
'administrator'
,
username:
'root'
)
}
let!
(
:user
)
{
create
(
:user
,
name:
'administrator'
,
username:
'root'
)
}
let
(
:js_dropdown_weight
)
{
'#js-dropdown-weight'
}
let
(
:js_dropdown_weight
)
{
'#js-dropdown-weight'
}
...
...
spec/features/issues/sub_nav_ee_spec.rb
View file @
f81df0d4
...
@@ -2,7 +2,7 @@ require 'spec_helper'
...
@@ -2,7 +2,7 @@ require 'spec_helper'
describe
'Issues sub nav EE'
do
describe
'Issues sub nav EE'
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:project
)
{
create
(
:
empty_
project
)
}
let
(
:project
)
{
create
(
:project
)
}
before
do
before
do
project
.
add_master
(
user
)
project
.
add_master
(
user
)
...
...
spec/features/profiles/pipeline_quota_spec.rb
View file @
f81df0d4
...
@@ -3,7 +3,7 @@ require 'spec_helper'
...
@@ -3,7 +3,7 @@ require 'spec_helper'
feature
'Profile > Pipeline Quota'
do
feature
'Profile > Pipeline Quota'
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:namespace
)
{
create
(
:namespace
,
owner:
user
)
}
let
(
:namespace
)
{
create
(
:namespace
,
owner:
user
)
}
let!
(
:project
)
{
create
(
:
empty_
project
,
namespace:
namespace
,
shared_runners_enabled:
true
)
}
let!
(
:project
)
{
create
(
:project
,
namespace:
namespace
,
shared_runners_enabled:
true
)
}
before
do
before
do
gitlab_sign_in
(
user
)
gitlab_sign_in
(
user
)
...
@@ -32,7 +32,7 @@ feature 'Profile > Pipeline Quota' do
...
@@ -32,7 +32,7 @@ feature 'Profile > Pipeline Quota' do
context
'with no projects using shared runners'
do
context
'with no projects using shared runners'
do
let
(
:namespace
)
{
create
(
:namespace
,
:with_not_used_build_minutes_limit
,
owner:
user
)
}
let
(
:namespace
)
{
create
(
:namespace
,
:with_not_used_build_minutes_limit
,
owner:
user
)
}
let!
(
:project
)
{
create
(
:
empty_
project
,
namespace:
namespace
,
shared_runners_enabled:
false
)
}
let!
(
:project
)
{
create
(
:project
,
namespace:
namespace
,
shared_runners_enabled:
false
)
}
it
'shows correct group quota info'
do
it
'shows correct group quota info'
do
visit
profile_pipeline_quota_path
visit
profile_pipeline_quota_path
...
@@ -64,7 +64,7 @@ feature 'Profile > Pipeline Quota' do
...
@@ -64,7 +64,7 @@ feature 'Profile > Pipeline Quota' do
context
'minutes over quota'
do
context
'minutes over quota'
do
let
(
:namespace
)
{
create
(
:namespace
,
:with_used_build_minutes_limit
,
owner:
user
)
}
let
(
:namespace
)
{
create
(
:namespace
,
:with_used_build_minutes_limit
,
owner:
user
)
}
let!
(
:other_project
)
{
create
(
:
empty_
project
,
namespace:
namespace
,
shared_runners_enabled:
false
)
}
let!
(
:other_project
)
{
create
(
:project
,
namespace:
namespace
,
shared_runners_enabled:
false
)
}
it
'shows correct group quota and projects info'
do
it
'shows correct group quota and projects info'
do
visit
profile_pipeline_quota_path
visit
profile_pipeline_quota_path
...
...
spec/features/projects/ee/geo_clone_instructions_spec.rb
View file @
f81df0d4
...
@@ -3,7 +3,7 @@ require 'rails_helper'
...
@@ -3,7 +3,7 @@ require 'rails_helper'
feature
'Geo clone instructions'
,
:js
do
feature
'Geo clone instructions'
,
:js
do
include
Devise
::
Test
::
IntegrationHelpers
include
Devise
::
Test
::
IntegrationHelpers
let
(
:project
)
{
create
(
:
empty_
project
,
:empty_repo
)
}
let
(
:project
)
{
create
(
:project
,
:empty_repo
)
}
let
(
:developer
)
{
create
(
:user
)
}
let
(
:developer
)
{
create
(
:user
)
}
background
do
background
do
...
...
spec/features/projects/members/member_is_removed_from_project_spec.rb
View file @
f81df0d4
...
@@ -2,7 +2,7 @@ require 'spec_helper'
...
@@ -2,7 +2,7 @@ require 'spec_helper'
feature
'Projects > Members > Member is removed from project'
do
feature
'Projects > Members > Member is removed from project'
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:project
)
{
create
(
:
empty_
project
)
}
let
(
:project
)
{
create
(
:project
)
}
background
do
background
do
project
.
team
<<
[
user
,
:master
]
project
.
team
<<
[
user
,
:master
]
...
...
spec/features/projects/milestones/ee/milestone_spec.rb
View file @
f81df0d4
...
@@ -2,7 +2,7 @@ require 'spec_helper'
...
@@ -2,7 +2,7 @@ require 'spec_helper'
describe
'Milestones on EE'
do
describe
'Milestones on EE'
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:project
)
{
create
(
:
empty_
project
,
name:
'test'
,
namespace:
user
.
namespace
)
}
let
(
:project
)
{
create
(
:project
,
name:
'test'
,
namespace:
user
.
namespace
)
}
let
(
:milestone
)
{
create
(
:milestone
,
project:
project
,
start_date:
Date
.
today
,
due_date:
7
.
days
.
from_now
)
}
let
(
:milestone
)
{
create
(
:milestone
,
project:
project
,
start_date:
Date
.
today
,
due_date:
7
.
days
.
from_now
)
}
before
do
before
do
...
...
spec/features/projects/settings/ee/issues_settings_spec.rb
View file @
f81df0d4
...
@@ -4,7 +4,7 @@ describe 'Project settings > [EE] Merge Requests', :js do
...
@@ -4,7 +4,7 @@ describe 'Project settings > [EE] Merge Requests', :js do
include
GitlabRoutingHelper
include
GitlabRoutingHelper
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:project
)
{
create
(
:
empty_
project
,
approvals_before_merge:
1
)
}
let
(
:project
)
{
create
(
:project
,
approvals_before_merge:
1
)
}
before
do
before
do
gitlab_sign_in
(
user
)
gitlab_sign_in
(
user
)
...
...
spec/features/projects/settings/ee/merge_requests_settings_spec.rb
View file @
f81df0d4
...
@@ -4,7 +4,7 @@ describe 'Project settings > [EE] Merge Requests', :js do
...
@@ -4,7 +4,7 @@ describe 'Project settings > [EE] Merge Requests', :js do
include
GitlabRoutingHelper
include
GitlabRoutingHelper
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:project
)
{
create
(
:
empty_
project
,
approvals_before_merge:
1
)
}
let
(
:project
)
{
create
(
:project
,
approvals_before_merge:
1
)
}
let
(
:group
)
{
create
(
:group
)
}
let
(
:group
)
{
create
(
:group
)
}
let
(
:group_member
)
{
create
(
:user
)
}
let
(
:group_member
)
{
create
(
:user
)
}
let
(
:non_member
)
{
create
(
:user
)
}
let
(
:non_member
)
{
create
(
:user
)
}
...
...
spec/features/projects/settings/slack_application_spec.rb
View file @
f81df0d4
require
'spec_helper'
require
'spec_helper'
feature
'Slack application'
do
feature
'Slack application'
do
let
(
:project
)
{
create
(
:
empty_
project
)
}
let
(
:project
)
{
create
(
:project
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:role
)
{
:developer
}
let
(
:role
)
{
:developer
}
let
(
:service
)
{
create
(
:gitlab_slack_application_service
,
project:
project
)
}
let
(
:service
)
{
create
(
:gitlab_slack_application_service
,
project:
project
)
}
...
...
spec/features/variables_ee_spec.rb
View file @
f81df0d4
...
@@ -2,7 +2,7 @@ require 'spec_helper'
...
@@ -2,7 +2,7 @@ require 'spec_helper'
describe
'Project variables EE'
,
js:
true
do
describe
'Project variables EE'
,
js:
true
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:project
)
{
create
(
:
empty_
project
)
}
let
(
:project
)
{
create
(
:project
)
}
let
(
:variable
)
{
create
(
:ci_variable
,
key:
'test_key'
,
value:
'test value'
)
}
let
(
:variable
)
{
create
(
:ci_variable
,
key:
'test_key'
,
value:
'test value'
)
}
let
(
:variable_environment_scope
)
{
true
}
let
(
:variable_environment_scope
)
{
true
}
...
...
spec/helpers/ee/gitlab_routing_helper_spec.rb
View file @
f81df0d4
...
@@ -5,7 +5,7 @@ describe EE::GitlabRoutingHelper do
...
@@ -5,7 +5,7 @@ describe EE::GitlabRoutingHelper do
include
ApplicationSettingsHelper
include
ApplicationSettingsHelper
let!
(
:primary_node
)
{
create
(
:geo_node
,
:primary
)
}
let!
(
:primary_node
)
{
create
(
:geo_node
,
:primary
)
}
let
(
:project
)
{
build_stubbed
(
:
empty_
project
)
}
let
(
:project
)
{
build_stubbed
(
:project
)
}
describe
'#geo_primary_default_url_to_repo'
do
describe
'#geo_primary_default_url_to_repo'
do
it
'returns an HTTP URL'
do
it
'returns an HTTP URL'
do
...
...
spec/lib/audit/details_spec.rb
View file @
f81df0d4
...
@@ -21,7 +21,7 @@ describe Audit::Details do
...
@@ -21,7 +21,7 @@ describe Audit::Details do
context
'project'
do
context
'project'
do
let
(
:user_member
)
{
create
(
:user
)
}
let
(
:user_member
)
{
create
(
:user
)
}
let
(
:project
)
{
create
(
:
empty_
project
)
}
let
(
:project
)
{
create
(
:project
)
}
let
(
:member
)
{
create
(
:project_member
,
:developer
,
user:
user_member
,
project:
project
)
}
let
(
:member
)
{
create
(
:project_member
,
:developer
,
user:
user_member
,
project:
project
)
}
let
(
:member_access_action
)
do
let
(
:member_access_action
)
do
{
{
...
...
spec/lib/ee/gitlab/ldap/sync/group_spec.rb
View file @
f81df0d4
...
@@ -237,7 +237,7 @@ describe EE::Gitlab::LDAP::Sync::Group do
...
@@ -237,7 +237,7 @@ describe EE::Gitlab::LDAP::Sync::Group do
end
end
it
'updates projects authorizations'
do
it
'updates projects authorizations'
do
project
=
create
(
:
empty_
project
,
namespace:
group
)
project
=
create
(
:project
,
namespace:
group
)
group
.
add_user
(
user
,
Gitlab
::
Access
::
MASTER
)
group
.
add_user
(
user
,
Gitlab
::
Access
::
MASTER
)
sync_group
.
update_permissions
sync_group
.
update_permissions
...
...
spec/lib/gitlab/elastic/indexer_spec.rb
View file @
f81df0d4
...
@@ -17,7 +17,7 @@ describe Gitlab::Elastic::Indexer do
...
@@ -17,7 +17,7 @@ describe Gitlab::Elastic::Indexer do
let
(
:popen_failure
)
{
[[
'error'
],
1
]
}
let
(
:popen_failure
)
{
[[
'error'
],
1
]
}
context
'empty project'
do
context
'empty project'
do
let
(
:project
)
{
create
(
:
empty_
project
)
}
let
(
:project
)
{
create
(
:project
)
}
it
'updates the index status without running the indexing command'
do
it
'updates the index status without running the indexing command'
do
expect_popen
.
never
expect_popen
.
never
...
...
spec/lib/gitlab/elastic/project_search_results_spec.rb
View file @
f81df0d4
...
@@ -64,7 +64,7 @@ describe Gitlab::Elastic::ProjectSearchResults do
...
@@ -64,7 +64,7 @@ describe Gitlab::Elastic::ProjectSearchResults do
context
'visibility checks'
do
context
'visibility checks'
do
it
'shows wiki for guests'
do
it
'shows wiki for guests'
do
project
=
create
:
empty_
project
,
:public
project
=
create
:project
,
:public
guest
=
create
:user
guest
=
create
:user
project
.
add_guest
(
guest
)
project
.
add_guest
(
guest
)
...
@@ -125,7 +125,7 @@ describe Gitlab::Elastic::ProjectSearchResults do
...
@@ -125,7 +125,7 @@ describe Gitlab::Elastic::ProjectSearchResults do
end
end
describe
'search for blobs in non-default branch'
do
describe
'search for blobs in non-default branch'
do
let
(
:project
)
{
create
(
:project
,
:public
,
:repository_private
)
}
let
(
:project
)
{
create
(
:project
,
:public
,
:repository
,
:repository
_private
)
}
let
(
:result
)
{
described_class
.
new
(
user
,
'initial'
,
project
.
id
,
'test'
)
}
let
(
:result
)
{
described_class
.
new
(
user
,
'initial'
,
project
.
id
,
'test'
)
}
subject
(
:blobs
)
{
result
.
objects
(
'blobs'
)
}
subject
(
:blobs
)
{
result
.
objects
(
'blobs'
)
}
...
...
spec/lib/gitlab/elastic/search_results_spec.rb
View file @
f81df0d4
...
@@ -77,8 +77,8 @@ describe Gitlab::Elastic::SearchResults do
...
@@ -77,8 +77,8 @@ describe Gitlab::Elastic::SearchResults do
end
end
describe
'confidential issues'
do
describe
'confidential issues'
do
let
(
:project_3
)
{
create
(
:
empty_
project
)
}
let
(
:project_3
)
{
create
(
:project
)
}
let
(
:project_4
)
{
create
(
:
empty_
project
)
}
let
(
:project_4
)
{
create
(
:project
)
}
let
(
:limit_project_ids
)
{
[
project_1
.
id
,
project_2
.
id
,
project_3
.
id
]
}
let
(
:limit_project_ids
)
{
[
project_1
.
id
,
project_2
.
id
,
project_3
.
id
]
}
let
(
:author
)
{
create
(
:user
)
}
let
(
:author
)
{
create
(
:user
)
}
let
(
:assignee
)
{
create
(
:user
)
}
let
(
:assignee
)
{
create
(
:user
)
}
...
...
spec/lib/gitlab/email/handler/ee/service_desk_handler_spec.rb
View file @
f81df0d4
...
@@ -12,7 +12,7 @@ describe Gitlab::Email::Handler::EE::ServiceDeskHandler do
...
@@ -12,7 +12,7 @@ describe Gitlab::Email::Handler::EE::ServiceDeskHandler do
let
(
:namespace
)
{
create
(
:namespace
,
name:
"email"
)
}
let
(
:namespace
)
{
create
(
:namespace
,
name:
"email"
)
}
context
'service desk is enabled for the project'
do
context
'service desk is enabled for the project'
do
let
(
:project
)
{
create
(
:
empty_
project
,
:public
,
namespace:
namespace
,
path:
'test'
,
service_desk_enabled:
true
)
}
let
(
:project
)
{
create
(
:project
,
:public
,
namespace:
namespace
,
path:
'test'
,
service_desk_enabled:
true
)
}
before
do
before
do
allow
(
Notify
).
to
receive
(
:service_desk_thank_you_email
)
allow
(
Notify
).
to
receive
(
:service_desk_thank_you_email
)
...
@@ -85,7 +85,7 @@ describe Gitlab::Email::Handler::EE::ServiceDeskHandler do
...
@@ -85,7 +85,7 @@ describe Gitlab::Email::Handler::EE::ServiceDeskHandler do
end
end
context
'service desk is disabled for the project'
do
context
'service desk is disabled for the project'
do
let
(
:project
)
{
create
(
:
empty_
project
,
:public
,
namespace:
namespace
,
path:
'test'
)
}
let
(
:project
)
{
create
(
:project
,
:public
,
namespace:
namespace
,
path:
'test'
)
}
it
'bounces the email'
do
it
'bounces the email'
do
expect
{
receiver
.
execute
}.
to
raise_error
(
Gitlab
::
Email
::
ProcessingError
)
expect
{
receiver
.
execute
}.
to
raise_error
(
Gitlab
::
Email
::
ProcessingError
)
...
...
spec/lib/gitlab/path_locks_finder_spec.rb
View file @
f81df0d4
require
'spec_helper'
require
'spec_helper'
describe
Gitlab
::
PathLocksFinder
do
describe
Gitlab
::
PathLocksFinder
do
let
(
:project
)
{
create
:
empty_
project
}
let
(
:project
)
{
create
:project
}
let
(
:user
)
{
create
:user
}
let
(
:user
)
{
create
:user
}
let
(
:finder
)
{
described_class
.
new
(
project
)
}
let
(
:finder
)
{
described_class
.
new
(
project
)
}
...
...
spec/lib/gitlab/repository_size_error_spec.rb
View file @
f81df0d4
...
@@ -2,7 +2,7 @@ require 'spec_helper'
...
@@ -2,7 +2,7 @@ require 'spec_helper'
describe
Gitlab
::
RepositorySizeError
do
describe
Gitlab
::
RepositorySizeError
do
let
(
:project
)
do
let
(
:project
)
do
create
(
:
empty_
project
,
statistics:
build
(
:project_statistics
,
repository_size:
15
.
megabytes
))
create
(
:project
,
statistics:
build
(
:project_statistics
,
repository_size:
15
.
megabytes
))
end
end
let
(
:message
)
{
described_class
.
new
(
project
)
}
let
(
:message
)
{
described_class
.
new
(
project
)
}
...
...
spec/lib/gitlab/usage_data_spec.rb
View file @
f81df0d4
require
'spec_helper'
require
'spec_helper'
describe
Gitlab
::
UsageData
do
describe
Gitlab
::
UsageData
do
let
(
:project
)
{
create
(
:
empty_
project
)
}
let
(
:project
)
{
create
(
:project
)
}
let
(
:projects
)
{
create_list
(
:project
,
3
)
}
let
(
:projects
)
{
create_list
(
:project
,
3
)
}
let!
(
:board
)
{
create
(
:board
,
project:
projects
[
0
])
}
let!
(
:board
)
{
create
(
:board
,
project:
projects
[
0
])
}
...
...
spec/mailers/emails/csv_export_spec.rb
View file @
f81df0d4
...
@@ -7,7 +7,7 @@ describe Emails::CsvExport do
...
@@ -7,7 +7,7 @@ describe Emails::CsvExport do
describe
'csv export email'
do
describe
'csv export email'
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:empty_project
)
{
create
(
:
empty_
project
,
path:
'myproject'
)
}
let
(
:empty_project
)
{
create
(
:project
,
path:
'myproject'
)
}
let
(
:export_status
)
{
{
truncated:
false
,
rows_expected:
3
,
rows_written:
3
}
}
let
(
:export_status
)
{
{
truncated:
false
,
rows_expected:
3
,
rows_written:
3
}
}
subject
{
Notify
.
issues_csv_email
(
user
,
empty_project
,
"dummy content"
,
export_status
)
}
subject
{
Notify
.
issues_csv_email
(
user
,
empty_project
,
"dummy content"
,
export_status
)
}
let
(
:attachment
)
{
subject
.
attachments
.
first
}
let
(
:attachment
)
{
subject
.
attachments
.
first
}
...
...
spec/models/concerns/elastic/issue_spec.rb
View file @
f81df0d4
...
@@ -11,7 +11,7 @@ describe Issue, elastic: true do
...
@@ -11,7 +11,7 @@ describe Issue, elastic: true do
stub_application_setting
(
elasticsearch_search:
false
,
elasticsearch_indexing:
false
)
stub_application_setting
(
elasticsearch_search:
false
,
elasticsearch_indexing:
false
)
end
end
let
(
:project
)
{
create
:
empty_
project
}
let
(
:project
)
{
create
:project
}
it
"searches issues"
do
it
"searches issues"
do
Sidekiq
::
Testing
.
inline!
do
Sidekiq
::
Testing
.
inline!
do
...
...
spec/models/concerns/elastic/milestone_spec.rb
View file @
f81df0d4
...
@@ -12,7 +12,7 @@ describe Milestone, elastic: true do
...
@@ -12,7 +12,7 @@ describe Milestone, elastic: true do
end
end
it
"searches milestones"
do
it
"searches milestones"
do
project
=
create
:
empty_
project
project
=
create
:project
Sidekiq
::
Testing
.
inline!
do
Sidekiq
::
Testing
.
inline!
do
create
:milestone
,
title:
'bla-bla term1'
,
project:
project
create
:milestone
,
title:
'bla-bla term1'
,
project:
project
...
...
spec/models/concerns/elastic/project_spec.rb
View file @
f81df0d4
...
@@ -15,10 +15,10 @@ describe Project, elastic: true do
...
@@ -15,10 +15,10 @@ describe Project, elastic: true do
project_ids
=
[]
project_ids
=
[]
Sidekiq
::
Testing
.
inline!
do
Sidekiq
::
Testing
.
inline!
do
project
=
create
:
empty_
project
,
name:
'test1'
project
=
create
:project
,
name:
'test1'
project1
=
create
:
empty_
project
,
path:
'test2'
,
description:
'awesome project'
project1
=
create
:project
,
path:
'test2'
,
description:
'awesome project'
project2
=
create
:
empty_
project
project2
=
create
:project
create
:
empty_
project
,
path:
'someone_elses_project'
create
:project
,
path:
'someone_elses_project'
project_ids
+=
[
project
.
id
,
project1
.
id
,
project2
.
id
]
project_ids
+=
[
project
.
id
,
project1
.
id
,
project2
.
id
]
Gitlab
::
Elastic
::
Helper
.
refresh_index
Gitlab
::
Elastic
::
Helper
.
refresh_index
...
@@ -35,8 +35,8 @@ describe Project, elastic: true do
...
@@ -35,8 +35,8 @@ describe Project, elastic: true do
project_ids
=
[]
project_ids
=
[]
Sidekiq
::
Testing
.
inline!
do
Sidekiq
::
Testing
.
inline!
do
project
=
create
:
empty_
project
,
name:
'tesla-model-s'
project
=
create
:project
,
name:
'tesla-model-s'
project1
=
create
:
empty_
project
,
name:
'tesla_model_s'
project1
=
create
:project
,
name:
'tesla_model_s'
project_ids
+=
[
project
.
id
,
project1
.
id
]
project_ids
+=
[
project
.
id
,
project1
.
id
]
Gitlab
::
Elastic
::
Helper
.
refresh_index
Gitlab
::
Elastic
::
Helper
.
refresh_index
...
@@ -46,7 +46,7 @@ describe Project, elastic: true do
...
@@ -46,7 +46,7 @@ describe Project, elastic: true do
end
end
it
"returns json with all needed elements"
do
it
"returns json with all needed elements"
do
project
=
create
:
empty_
project
project
=
create
:project
expected_hash
=
project
.
attributes
.
extract!
(
expected_hash
=
project
.
attributes
.
extract!
(
'id'
,
'id'
,
...
...
spec/models/concerns/elastic/project_wiki_spec.rb
View file @
f81df0d4
...
@@ -12,7 +12,7 @@ describe ProjectWiki, elastic: true do
...
@@ -12,7 +12,7 @@ describe ProjectWiki, elastic: true do
end
end
it
"searches wiki page"
do
it
"searches wiki page"
do
project
=
create
:
empty_
project
project
=
create
:project
Sidekiq
::
Testing
.
inline!
do
Sidekiq
::
Testing
.
inline!
do
project
.
wiki
.
create_page
(
"index_page"
,
"Bla bla term1"
)
project
.
wiki
.
create_page
(
"index_page"
,
"Bla bla term1"
)
...
...
spec/models/concerns/elastic/snippet_spec.rb
View file @
f81df0d4
...
@@ -13,7 +13,7 @@ describe Snippet, elastic: true do
...
@@ -13,7 +13,7 @@ describe Snippet, elastic: true do
context
'searching snippets by code'
do
context
'searching snippets by code'
do
let!
(
:author
)
{
create
(
:user
)
}
let!
(
:author
)
{
create
(
:user
)
}
let!
(
:project
)
{
create
(
:
empty_
project
)
}
let!
(
:project
)
{
create
(
:project
)
}
let!
(
:public_snippet
)
{
create
(
:snippet
,
:public
,
content:
'password: XXX'
)
}
let!
(
:public_snippet
)
{
create
(
:snippet
,
:public
,
content:
'password: XXX'
)
}
let!
(
:internal_snippet
)
{
create
(
:snippet
,
:internal
,
content:
'password: XXX'
)
}
let!
(
:internal_snippet
)
{
create
(
:snippet
,
:internal
,
content:
'password: XXX'
)
}
...
...
spec/models/ee/namespace_spec.rb
View file @
f81df0d4
...
@@ -143,7 +143,7 @@ describe Namespace do
...
@@ -143,7 +143,7 @@ describe Namespace do
context
'with project'
do
context
'with project'
do
context
'and disabled shared runners'
do
context
'and disabled shared runners'
do
let!
(
:project
)
do
let!
(
:project
)
do
create
(
:
empty_
project
,
create
(
:project
,
namespace:
namespace
,
namespace:
namespace
,
shared_runners_enabled:
false
)
shared_runners_enabled:
false
)
end
end
...
@@ -153,7 +153,7 @@ describe Namespace do
...
@@ -153,7 +153,7 @@ describe Namespace do
context
'and enabled shared runners'
do
context
'and enabled shared runners'
do
let!
(
:project
)
do
let!
(
:project
)
do
create
(
:
empty_
project
,
create
(
:project
,
namespace:
namespace
,
namespace:
namespace
,
shared_runners_enabled:
true
)
shared_runners_enabled:
true
)
end
end
...
@@ -196,7 +196,7 @@ describe Namespace do
...
@@ -196,7 +196,7 @@ describe Namespace do
context
'with project'
do
context
'with project'
do
let!
(
:project
)
do
let!
(
:project
)
do
create
(
:
empty_
project
,
create
(
:project
,
namespace:
namespace
,
namespace:
namespace
,
shared_runners_enabled:
true
)
shared_runners_enabled:
true
)
end
end
...
@@ -224,7 +224,7 @@ describe Namespace do
...
@@ -224,7 +224,7 @@ describe Namespace do
context
'with project'
do
context
'with project'
do
let!
(
:project
)
do
let!
(
:project
)
do
create
(
:
empty_
project
,
create
(
:project
,
namespace:
namespace
,
namespace:
namespace
,
shared_runners_enabled:
true
)
shared_runners_enabled:
true
)
end
end
...
...
spec/models/ee/project_spec.rb
View file @
f81df0d4
...
@@ -17,7 +17,7 @@ describe Project do
...
@@ -17,7 +17,7 @@ describe Project do
end
end
describe
'#push_rule'
do
describe
'#push_rule'
do
let
(
:project
)
{
create
(
:
empty_
project
,
push_rule:
create
(
:push_rule
))
}
let
(
:project
)
{
create
(
:project
,
push_rule:
create
(
:push_rule
))
}
subject
(
:push_rule
)
{
project
.
push_rule
(
true
)
}
subject
(
:push_rule
)
{
project
.
push_rule
(
true
)
}
...
@@ -35,7 +35,7 @@ describe Project do
...
@@ -35,7 +35,7 @@ describe Project do
describe
"#execute_hooks"
do
describe
"#execute_hooks"
do
context
"group hooks"
do
context
"group hooks"
do
let
(
:group
)
{
create
(
:group
)
}
let
(
:group
)
{
create
(
:group
)
}
let
(
:project
)
{
create
(
:
empty_
project
,
namespace:
group
)
}
let
(
:project
)
{
create
(
:project
,
namespace:
group
)
}
let
(
:group_hook
)
{
create
(
:group_hook
,
group:
group
,
push_events:
true
)
}
let
(
:group_hook
)
{
create
(
:group_hook
,
group:
group
,
push_events:
true
)
}
it
'executes the hook when the feature is enabled'
do
it
'executes the hook when the feature is enabled'
do
...
@@ -63,7 +63,7 @@ describe Project do
...
@@ -63,7 +63,7 @@ describe Project do
describe
'#execute_hooks'
do
describe
'#execute_hooks'
do
it
"triggers project and group hooks"
do
it
"triggers project and group hooks"
do
group
=
create
:group
,
name:
'gitlab'
group
=
create
:group
,
name:
'gitlab'
project
=
create
(
:
empty_
project
,
name:
'gitlabhq'
,
namespace:
group
)
project
=
create
(
:project
,
name:
'gitlabhq'
,
namespace:
group
)
project_hook
=
create
(
:project_hook
,
push_events:
true
,
project:
project
)
project_hook
=
create
(
:project_hook
,
push_events:
true
,
project:
project
)
group_hook
=
create
(
:group_hook
,
push_events:
true
,
group:
group
)
group_hook
=
create
(
:group_hook
,
push_events:
true
,
group:
group
)
...
@@ -78,7 +78,7 @@ describe Project do
...
@@ -78,7 +78,7 @@ describe Project do
end
end
describe
'#allowed_to_share_with_group?'
do
describe
'#allowed_to_share_with_group?'
do
let
(
:project
)
{
create
(
:
empty_
project
)
}
let
(
:project
)
{
create
(
:project
)
}
it
"returns true"
do
it
"returns true"
do
expect
(
project
.
allowed_to_share_with_group?
).
to
be_truthy
expect
(
project
.
allowed_to_share_with_group?
).
to
be_truthy
...
@@ -92,7 +92,7 @@ describe Project do
...
@@ -92,7 +92,7 @@ describe Project do
describe
'#feature_available?'
do
describe
'#feature_available?'
do
let
(
:namespace
)
{
build_stubbed
(
:namespace
)
}
let
(
:namespace
)
{
build_stubbed
(
:namespace
)
}
let
(
:project
)
{
build_stubbed
(
:
empty_
project
,
namespace:
namespace
)
}
let
(
:project
)
{
build_stubbed
(
:project
,
namespace:
namespace
)
}
let
(
:user
)
{
build_stubbed
(
:user
)
}
let
(
:user
)
{
build_stubbed
(
:user
)
}
subject
{
project
.
feature_available?
(
feature
,
user
)
}
subject
{
project
.
feature_available?
(
feature
,
user
)
}
...
@@ -198,7 +198,7 @@ describe Project do
...
@@ -198,7 +198,7 @@ describe Project do
describe
'#mirror_waiting_duration'
do
describe
'#mirror_waiting_duration'
do
it
'returns in seconds the time spent in the queue'
do
it
'returns in seconds the time spent in the queue'
do
project
=
create
(
:
empty_
project
,
:mirror
,
:import_scheduled
)
project
=
create
(
:project
,
:mirror
,
:import_scheduled
)
mirror_data
=
project
.
mirror_data
mirror_data
=
project
.
mirror_data
mirror_data
.
update_attributes
(
last_update_started_at:
mirror_data
.
last_update_scheduled_at
+
5
.
minutes
)
mirror_data
.
update_attributes
(
last_update_started_at:
mirror_data
.
last_update_scheduled_at
+
5
.
minutes
)
...
@@ -209,7 +209,7 @@ describe Project do
...
@@ -209,7 +209,7 @@ describe Project do
describe
'#mirror_update_duration'
do
describe
'#mirror_update_duration'
do
it
'returns in seconds the time spent updating'
do
it
'returns in seconds the time spent updating'
do
project
=
create
(
:
empty_
project
,
:mirror
,
:import_started
)
project
=
create
(
:project
,
:mirror
,
:import_started
)
project
.
update_attributes
(
mirror_last_update_at:
project
.
mirror_data
.
last_update_started_at
+
5
.
minutes
)
project
.
update_attributes
(
mirror_last_update_at:
project
.
mirror_data
.
last_update_started_at
+
5
.
minutes
)
...
@@ -218,7 +218,7 @@ describe Project do
...
@@ -218,7 +218,7 @@ describe Project do
end
end
describe
'#has_remote_mirror?'
do
describe
'#has_remote_mirror?'
do
let
(
:project
)
{
create
(
:
empty_
project
,
:remote_mirror
,
:import_started
)
}
let
(
:project
)
{
create
(
:project
,
:remote_mirror
,
:import_started
)
}
subject
{
project
.
has_remote_mirror?
}
subject
{
project
.
has_remote_mirror?
}
before
do
before
do
...
@@ -243,7 +243,7 @@ describe Project do
...
@@ -243,7 +243,7 @@ describe Project do
end
end
describe
'#update_remote_mirrors'
do
describe
'#update_remote_mirrors'
do
let
(
:project
)
{
create
(
:
empty_
project
,
:remote_mirror
,
:import_started
)
}
let
(
:project
)
{
create
(
:project
,
:remote_mirror
,
:import_started
)
}
delegate
:update_remote_mirrors
,
to: :project
delegate
:update_remote_mirrors
,
to: :project
before
do
before
do
...
@@ -274,7 +274,7 @@ describe Project do
...
@@ -274,7 +274,7 @@ describe Project do
end
end
describe
'#any_runners_limit'
do
describe
'#any_runners_limit'
do
let
(
:project
)
{
create
(
:
empty_
project
,
shared_runners_enabled:
shared_runners_enabled
)
}
let
(
:project
)
{
create
(
:project
,
shared_runners_enabled:
shared_runners_enabled
)
}
let
(
:specific_runner
)
{
create
(
:ci_runner
)
}
let
(
:specific_runner
)
{
create
(
:ci_runner
)
}
let
(
:shared_runner
)
{
create
(
:ci_runner
,
:shared
)
}
let
(
:shared_runner
)
{
create
(
:ci_runner
,
:shared
)
}
...
@@ -296,7 +296,7 @@ describe Project do
...
@@ -296,7 +296,7 @@ describe Project do
context
'with used pipeline minutes'
do
context
'with used pipeline minutes'
do
let
(
:namespace
)
{
create
(
:namespace
,
:with_used_build_minutes_limit
)
}
let
(
:namespace
)
{
create
(
:namespace
,
:with_used_build_minutes_limit
)
}
let
(
:project
)
do
let
(
:project
)
do
create
(
:
empty_
project
,
create
(
:project
,
namespace:
namespace
,
namespace:
namespace
,
shared_runners_enabled:
shared_runners_enabled
)
shared_runners_enabled:
shared_runners_enabled
)
end
end
...
@@ -314,7 +314,7 @@ describe Project do
...
@@ -314,7 +314,7 @@ describe Project do
context
'with used pipeline minutes'
do
context
'with used pipeline minutes'
do
let
(
:namespace
)
{
create
(
:namespace
,
:with_used_build_minutes_limit
)
}
let
(
:namespace
)
{
create
(
:namespace
,
:with_used_build_minutes_limit
)
}
let
(
:project
)
do
let
(
:project
)
do
create
(
:
empty_
project
,
create
(
:project
,
namespace:
namespace
,
namespace:
namespace
,
shared_runners_enabled:
true
)
shared_runners_enabled:
true
)
end
end
...
@@ -330,7 +330,7 @@ describe Project do
...
@@ -330,7 +330,7 @@ describe Project do
end
end
describe
'#shared_runners_minutes_limit_enabled?'
do
describe
'#shared_runners_minutes_limit_enabled?'
do
let
(
:project
)
{
create
(
:
empty_
project
)
}
let
(
:project
)
{
create
(
:project
)
}
subject
{
project
.
shared_runners_minutes_limit_enabled?
}
subject
{
project
.
shared_runners_minutes_limit_enabled?
}
...
@@ -379,7 +379,7 @@ describe Project do
...
@@ -379,7 +379,7 @@ describe Project do
end
end
describe
'#size_limit_enabled?'
do
describe
'#size_limit_enabled?'
do
let
(
:project
)
{
create
(
:
empty_
project
)
}
let
(
:project
)
{
create
(
:project
)
}
context
'when repository_size_limit is not configured'
do
context
'when repository_size_limit is not configured'
do
it
'is disabled'
do
it
'is disabled'
do
...
@@ -424,7 +424,7 @@ describe Project do
...
@@ -424,7 +424,7 @@ describe Project do
let!
(
:license
)
{
create
(
:license
,
plan:
License
::
PREMIUM_PLAN
)
}
let!
(
:license
)
{
create
(
:license
,
plan:
License
::
PREMIUM_PLAN
)
}
let
(
:namespace
)
{
create
(
:namespace
)
}
let
(
:namespace
)
{
create
(
:namespace
)
}
subject
(
:project
)
{
build
(
:
empty_
project
,
:private
,
namespace:
namespace
,
service_desk_enabled:
true
)
}
subject
(
:project
)
{
build
(
:project
,
:private
,
namespace:
namespace
,
service_desk_enabled:
true
)
}
before
do
before
do
allow
(
::
Gitlab
).
to
receive
(
:com?
).
and_return
(
true
)
allow
(
::
Gitlab
).
to
receive
(
:com?
).
and_return
(
true
)
...
@@ -459,7 +459,7 @@ describe Project do
...
@@ -459,7 +459,7 @@ describe Project do
end
end
describe
'#service_desk_address'
do
describe
'#service_desk_address'
do
let
(
:project
)
{
create
(
:
empty_
project
,
service_desk_enabled:
true
)
}
let
(
:project
)
{
create
(
:project
,
service_desk_enabled:
true
)
}
before
do
before
do
allow
(
::
EE
::
Gitlab
::
ServiceDesk
).
to
receive
(
:enabled?
).
and_return
(
true
)
allow
(
::
EE
::
Gitlab
::
ServiceDesk
).
to
receive
(
:enabled?
).
and_return
(
true
)
...
@@ -473,7 +473,7 @@ describe Project do
...
@@ -473,7 +473,7 @@ describe Project do
end
end
describe
'#secret_variables_for'
do
describe
'#secret_variables_for'
do
let
(
:project
)
{
create
(
:
empty_
project
)
}
let
(
:project
)
{
create
(
:project
)
}
let!
(
:secret_variable
)
do
let!
(
:secret_variable
)
do
create
(
:ci_variable
,
value:
'secret'
,
project:
project
)
create
(
:ci_variable
,
value:
'secret'
,
project:
project
)
...
@@ -647,7 +647,7 @@ describe Project do
...
@@ -647,7 +647,7 @@ describe Project do
].
each
do
|
spec
|
].
each
do
|
spec
|
context
spec
.
inspect
do
context
spec
.
inspect
do
let
(
:spec
)
{
spec
}
let
(
:spec
)
{
spec
}
let
(
:project
)
{
build
(
:
empty_
project
,
approvals_before_merge:
spec
[
:database
])
}
let
(
:project
)
{
build
(
:project
,
approvals_before_merge:
spec
[
:database
])
}
subject
{
project
.
approvals_before_merge
}
subject
{
project
.
approvals_before_merge
}
...
@@ -669,7 +669,7 @@ describe Project do
...
@@ -669,7 +669,7 @@ describe Project do
].
each
do
|
spec
|
].
each
do
|
spec
|
context
spec
.
inspect
do
context
spec
.
inspect
do
let
(
:spec
)
{
spec
}
let
(
:spec
)
{
spec
}
let
(
:project
)
{
build
(
:
empty_
project
,
reset_approvals_on_push:
spec
[
:database
])
}
let
(
:project
)
{
build
(
:project
,
reset_approvals_on_push:
spec
[
:database
])
}
subject
{
project
.
reset_approvals_on_push?
}
subject
{
project
.
reset_approvals_on_push?
}
...
@@ -691,7 +691,7 @@ describe Project do
...
@@ -691,7 +691,7 @@ describe Project do
].
each
do
|
spec
|
].
each
do
|
spec
|
context
spec
.
inspect
do
context
spec
.
inspect
do
let
(
:spec
)
{
spec
}
let
(
:spec
)
{
spec
}
let
(
:project
)
{
build
(
:
empty_
project
,
approvals_before_merge:
spec
[
:database
])
}
let
(
:project
)
{
build
(
:project
,
approvals_before_merge:
spec
[
:database
])
}
subject
{
project
.
approvals_before_merge
}
subject
{
project
.
approvals_before_merge
}
...
@@ -724,7 +724,7 @@ describe Project do
...
@@ -724,7 +724,7 @@ describe Project do
{
ff:
false
,
rebase:
false
,
ff_licensed:
false
,
rebase_licensed:
false
,
method: :merge
}
{
ff:
false
,
rebase:
false
,
ff_licensed:
false
,
rebase_licensed:
false
,
method: :merge
}
].
each
do
|
spec
|
].
each
do
|
spec
|
context
spec
.
inspect
do
context
spec
.
inspect
do
let
(
:project
)
{
build
(
:
empty_
project
,
merge_requests_rebase_enabled:
spec
[
:rebase
],
merge_requests_ff_only_enabled:
spec
[
:ff
])
}
let
(
:project
)
{
build
(
:project
,
merge_requests_rebase_enabled:
spec
[
:rebase
],
merge_requests_ff_only_enabled:
spec
[
:ff
])
}
let
(
:spec
)
{
spec
}
let
(
:spec
)
{
spec
}
subject
{
project
.
merge_method
}
subject
{
project
.
merge_method
}
...
@@ -777,7 +777,7 @@ describe Project do
...
@@ -777,7 +777,7 @@ describe Project do
describe
'#disabled_services'
do
describe
'#disabled_services'
do
let
(
:namespace
)
{
create
(
:group
,
:private
)
}
let
(
:namespace
)
{
create
(
:group
,
:private
)
}
let
(
:project
)
{
create
(
:
empty_
project
,
:private
,
namespace:
namespace
)
}
let
(
:project
)
{
create
(
:project
,
:private
,
namespace:
namespace
)
}
let
(
:disabled_services
)
{
%w(jenkins jenkins_deprecated)
}
let
(
:disabled_services
)
{
%w(jenkins jenkins_deprecated)
}
context
'without a license key'
do
context
'without a license key'
do
...
...
spec/models/geo/project_registry_spec.rb
View file @
f81df0d4
...
@@ -10,7 +10,7 @@ describe Geo::ProjectRegistry do
...
@@ -10,7 +10,7 @@ describe Geo::ProjectRegistry do
end
end
describe
'.synced'
do
describe
'.synced'
do
let
(
:project
)
{
create
(
:
empty_
project
)
}
let
(
:project
)
{
create
(
:project
)
}
let
(
:synced_at
)
{
Time
.
now
}
let
(
:synced_at
)
{
Time
.
now
}
it
'does not return dirty projects'
do
it
'does not return dirty projects'
do
...
...
spec/models/issue_spec.rb
View file @
f81df0d4
...
@@ -331,8 +331,8 @@ describe Issue do
...
@@ -331,8 +331,8 @@ describe Issue do
describe
'#related_issues'
do
describe
'#related_issues'
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:authorized_project
)
{
create
(
:
empty_
project
)
}
let
(
:authorized_project
)
{
create
(
:project
)
}
let
(
:unauthorized_project
)
{
create
(
:
empty_
project
)
}
let
(
:unauthorized_project
)
{
create
(
:project
)
}
let
(
:authorized_issue_a
)
{
create
(
:issue
,
project:
authorized_project
)
}
let
(
:authorized_issue_a
)
{
create
(
:issue
,
project:
authorized_project
)
}
let
(
:authorized_issue_b
)
{
create
(
:issue
,
project:
authorized_project
)
}
let
(
:authorized_issue_b
)
{
create
(
:issue
,
project:
authorized_project
)
}
...
...
spec/models/merge_request_spec.rb
View file @
f81df0d4
...
@@ -572,7 +572,7 @@ describe MergeRequest do
...
@@ -572,7 +572,7 @@ describe MergeRequest do
end
end
describe
"#number_of_potential_approvers"
do
describe
"#number_of_potential_approvers"
do
let
(
:project
)
{
create
(
:
empty_
project
)
}
let
(
:project
)
{
create
(
:project
)
}
let
(
:author
)
{
create
(
:user
)
}
let
(
:author
)
{
create
(
:user
)
}
let
(
:merge_request
)
{
create
(
:merge_request
,
source_project:
project
,
author:
author
)
}
let
(
:merge_request
)
{
create
(
:merge_request
,
source_project:
project
,
author:
author
)
}
...
@@ -651,7 +651,7 @@ describe MergeRequest do
...
@@ -651,7 +651,7 @@ describe MergeRequest do
describe
"#overall_approver_groups"
do
describe
"#overall_approver_groups"
do
it
'returns a merge request group approver'
do
it
'returns a merge request group approver'
do
project
=
create
:
empty_
project
project
=
create
:project
create
:approver_group
,
target:
project
create
:approver_group
,
target:
project
merge_request
=
create
:merge_request
,
target_project:
project
,
source_project:
project
merge_request
=
create
:merge_request
,
target_project:
project
,
source_project:
project
...
@@ -661,7 +661,7 @@ describe MergeRequest do
...
@@ -661,7 +661,7 @@ describe MergeRequest do
end
end
it
'returns a project group approver'
do
it
'returns a project group approver'
do
project
=
create
:
empty_
project
project
=
create
:project
approver_group1
=
create
:approver_group
,
target:
project
approver_group1
=
create
:approver_group
,
target:
project
merge_request
=
create
:merge_request
,
target_project:
project
,
source_project:
project
merge_request
=
create
:merge_request
,
target_project:
project
,
source_project:
project
...
@@ -670,7 +670,7 @@ describe MergeRequest do
...
@@ -670,7 +670,7 @@ describe MergeRequest do
end
end
it
'returns a merge request approver if there is no project group approver'
do
it
'returns a merge request approver if there is no project group approver'
do
project
=
create
:
empty_
project
project
=
create
:project
merge_request
=
create
:merge_request
,
target_project:
project
,
source_project:
project
merge_request
=
create
:merge_request
,
target_project:
project
,
source_project:
project
approver_group1
=
create
:approver_group
,
target:
merge_request
approver_group1
=
create
:approver_group
,
target:
merge_request
...
@@ -686,7 +686,7 @@ describe MergeRequest do
...
@@ -686,7 +686,7 @@ describe MergeRequest do
user2
=
create
:user
user2
=
create
:user
create
:user
create
:user
project
=
create
:
empty_
project
project
=
create
:project
group
=
create
:group
group
=
create
:group
group
.
add_master
user
group
.
add_master
user
create
:approver_group
,
target:
project
,
group:
group
create
:approver_group
,
target:
project
,
group:
group
...
@@ -1520,7 +1520,7 @@ describe MergeRequest do
...
@@ -1520,7 +1520,7 @@ describe MergeRequest do
end
end
describe
'approvals'
do
describe
'approvals'
do
let
(
:project
)
{
create
(
:
empty_
project
)
}
let
(
:project
)
{
create
(
:project
)
}
let
(
:merge_request
)
{
create
(
:merge_request
,
source_project:
project
,
author:
author
)
}
let
(
:merge_request
)
{
create
(
:merge_request
,
source_project:
project
,
author:
author
)
}
let
(
:author
)
{
create
(
:user
)
}
let
(
:author
)
{
create
(
:user
)
}
let
(
:approver
)
{
create
(
:user
)
}
let
(
:approver
)
{
create
(
:user
)
}
...
...
spec/models/project_mirror_data_spec.rb
View file @
f81df0d4
...
@@ -17,7 +17,7 @@ describe ProjectMirrorData, type: :model do
...
@@ -17,7 +17,7 @@ describe ProjectMirrorData, type: :model do
describe
'when create'
do
describe
'when create'
do
it
'sets next execution timestamp to now'
do
it
'sets next execution timestamp to now'
do
project
=
create
(
:
empty_
project
)
project
=
create
(
:project
)
Timecop
.
freeze
(
Time
.
now
)
do
Timecop
.
freeze
(
Time
.
now
)
do
project
.
create_mirror_data
project
.
create_mirror_data
...
@@ -28,7 +28,7 @@ describe ProjectMirrorData, type: :model do
...
@@ -28,7 +28,7 @@ describe ProjectMirrorData, type: :model do
end
end
describe
'#reset_retry_count!'
do
describe
'#reset_retry_count!'
do
let
(
:mirror_data
)
{
create
(
:
empty_
project
,
:mirror
,
:import_finished
).
mirror_data
}
let
(
:mirror_data
)
{
create
(
:project
,
:mirror
,
:import_finished
).
mirror_data
}
it
'resets retry_count to 0'
do
it
'resets retry_count to 0'
do
mirror_data
.
retry_count
=
3
mirror_data
.
retry_count
=
3
...
@@ -38,7 +38,7 @@ describe ProjectMirrorData, type: :model do
...
@@ -38,7 +38,7 @@ describe ProjectMirrorData, type: :model do
end
end
describe
'#increment_retry_count!'
do
describe
'#increment_retry_count!'
do
let
(
:mirror_data
)
{
create
(
:
empty_
project
,
:mirror
,
:import_finished
).
mirror_data
}
let
(
:mirror_data
)
{
create
(
:project
,
:mirror
,
:import_finished
).
mirror_data
}
it
'increments retry_count'
do
it
'increments retry_count'
do
expect
{
mirror_data
.
increment_retry_count!
}.
to
change
{
mirror_data
.
retry_count
}.
from
(
0
).
to
(
1
)
expect
{
mirror_data
.
increment_retry_count!
}.
to
change
{
mirror_data
.
retry_count
}.
from
(
0
).
to
(
1
)
...
@@ -46,7 +46,7 @@ describe ProjectMirrorData, type: :model do
...
@@ -46,7 +46,7 @@ describe ProjectMirrorData, type: :model do
end
end
describe
'#set_next_execution_timestamp!'
do
describe
'#set_next_execution_timestamp!'
do
let
(
:mirror_data
)
{
create
(
:
empty_
project
,
:mirror
,
:import_finished
).
mirror_data
}
let
(
:mirror_data
)
{
create
(
:project
,
:mirror
,
:import_finished
).
mirror_data
}
let!
(
:timestamp
)
{
Time
.
now
}
let!
(
:timestamp
)
{
Time
.
now
}
let!
(
:jitter
)
{
2
.
seconds
}
let!
(
:jitter
)
{
2
.
seconds
}
let
(
:interval
)
{
2
.
minutes
}
let
(
:interval
)
{
2
.
minutes
}
...
...
spec/models/project_services/jenkins_deprecated_service_spec.rb
View file @
f81df0d4
...
@@ -62,7 +62,7 @@ eos
...
@@ -62,7 +62,7 @@ eos
end
end
describe
'multiproject enabled'
do
describe
'multiproject enabled'
do
let!
(
:project
)
{
create
(
:
empty_
project
)
}
let!
(
:project
)
{
create
(
:project
)
}
before
do
before
do
@service
=
JenkinsDeprecatedService
.
new
@service
=
JenkinsDeprecatedService
.
new
allow
(
@service
).
to
receive_messages
(
allow
(
@service
).
to
receive_messages
(
...
@@ -123,7 +123,7 @@ eos
...
@@ -123,7 +123,7 @@ eos
describe
'#execute'
do
describe
'#execute'
do
let
(
:user
)
{
create
(
:user
,
username:
'username'
)
}
let
(
:user
)
{
create
(
:user
,
username:
'username'
)
}
let
(
:namespace
)
{
create
(
:group
,
:private
)
}
let
(
:namespace
)
{
create
(
:group
,
:private
)
}
let
(
:project
)
{
create
(
:
empty_
project
,
:private
,
name:
'project'
,
namespace:
namespace
)
}
let
(
:project
)
{
create
(
:project
,
:private
,
name:
'project'
,
namespace:
namespace
)
}
let
(
:push_sample_data
)
{
Gitlab
::
DataBuilder
::
Push
.
build_sample
(
project
,
user
)
}
let
(
:push_sample_data
)
{
Gitlab
::
DataBuilder
::
Push
.
build_sample
(
project
,
user
)
}
let
(
:jenkins_service
)
{
described_class
.
create
(
active:
true
,
project:
project
)
}
let
(
:jenkins_service
)
{
described_class
.
create
(
active:
true
,
project:
project
)
}
let!
(
:service_hook
)
{
create
(
:service_hook
,
service:
jenkins_service
)
}
let!
(
:service_hook
)
{
create
(
:service_hook
,
service:
jenkins_service
)
}
...
...
spec/models/project_services/jenkins_service_spec.rb
View file @
f81df0d4
...
@@ -6,7 +6,7 @@ describe JenkinsService do
...
@@ -6,7 +6,7 @@ describe JenkinsService do
it
{
is_expected
.
to
have_one
:service_hook
}
it
{
is_expected
.
to
have_one
:service_hook
}
end
end
let
(
:project
)
{
create
(
:
empty_
project
)
}
let
(
:project
)
{
create
(
:project
)
}
let
(
:jenkins_url
)
{
'http://jenkins.example.com/'
}
let
(
:jenkins_url
)
{
'http://jenkins.example.com/'
}
let
(
:jenkins_hook_url
)
{
jenkins_url
+
'project/my_project'
}
let
(
:jenkins_hook_url
)
{
jenkins_url
+
'project/my_project'
}
...
@@ -125,7 +125,7 @@ describe JenkinsService do
...
@@ -125,7 +125,7 @@ describe JenkinsService do
describe
'#test'
do
describe
'#test'
do
it
'returns the right status'
do
it
'returns the right status'
do
user
=
create
(
:user
,
username:
'username'
)
user
=
create
(
:user
,
username:
'username'
)
project
=
create
(
:
empty_
project
,
name:
'project'
)
project
=
create
(
:project
,
name:
'project'
)
push_sample_data
=
Gitlab
::
DataBuilder
::
Push
.
build_sample
(
project
,
user
)
push_sample_data
=
Gitlab
::
DataBuilder
::
Push
.
build_sample
(
project
,
user
)
jenkins_service
=
described_class
.
create
(
jenkins_params
)
jenkins_service
=
described_class
.
create
(
jenkins_params
)
stub_request
(
:post
,
jenkins_hook_url
).
with
(
headers:
{
'Authorization'
=>
jenkins_authorization
})
stub_request
(
:post
,
jenkins_hook_url
).
with
(
headers:
{
'Authorization'
=>
jenkins_authorization
})
...
@@ -155,7 +155,7 @@ describe JenkinsService do
...
@@ -155,7 +155,7 @@ describe JenkinsService do
describe
'#execute'
do
describe
'#execute'
do
let
(
:user
)
{
create
(
:user
,
username:
'username'
)
}
let
(
:user
)
{
create
(
:user
,
username:
'username'
)
}
let
(
:namespace
)
{
create
(
:group
,
:private
)
}
let
(
:namespace
)
{
create
(
:group
,
:private
)
}
let
(
:project
)
{
create
(
:
empty_
project
,
:private
,
name:
'project'
,
namespace:
namespace
)
}
let
(
:project
)
{
create
(
:project
,
:private
,
name:
'project'
,
namespace:
namespace
)
}
let
(
:push_sample_data
)
{
Gitlab
::
DataBuilder
::
Push
.
build_sample
(
project
,
user
)
}
let
(
:push_sample_data
)
{
Gitlab
::
DataBuilder
::
Push
.
build_sample
(
project
,
user
)
}
let
(
:jenkins_service
)
{
described_class
.
create
(
jenkins_params
)
}
let
(
:jenkins_service
)
{
described_class
.
create
(
jenkins_params
)
}
...
@@ -217,7 +217,7 @@ describe JenkinsService do
...
@@ -217,7 +217,7 @@ describe JenkinsService do
end
end
describe
'Stored password invalidation'
do
describe
'Stored password invalidation'
do
let
(
:project
)
{
create
(
:
empty_
project
)
}
let
(
:project
)
{
create
(
:project
)
}
context
'when a password was previously set'
do
context
'when a password was previously set'
do
before
do
before
do
...
@@ -268,7 +268,7 @@ describe JenkinsService do
...
@@ -268,7 +268,7 @@ describe JenkinsService do
context
'when no password was previously set'
do
context
'when no password was previously set'
do
before
do
before
do
@jenkins_service
=
described_class
.
create
(
@jenkins_service
=
described_class
.
create
(
project:
create
(
:
empty_
project
),
project:
create
(
:project
),
properties:
{
properties:
{
jenkins_url:
'http://jenkins.example.com/'
,
jenkins_url:
'http://jenkins.example.com/'
,
username:
'jenkins'
username:
'jenkins'
...
...
spec/models/project_spec.rb
View file @
f81df0d4
...
@@ -126,7 +126,7 @@ describe Project do
...
@@ -126,7 +126,7 @@ describe Project do
context
'#with_wiki_enabled'
do
context
'#with_wiki_enabled'
do
it
'returns a project'
do
it
'returns a project'
do
project
=
create
(
:project_empty_repo
,
wiki_access_level:
ProjectFeature
::
ENABLED
)
project
=
create
(
:project_empty_repo
,
wiki_access_level:
ProjectFeature
::
ENABLED
)
project1
=
create
(
:
empty_
project
,
wiki_access_level:
ProjectFeature
::
DISABLED
)
project1
=
create
(
:project
,
wiki_access_level:
ProjectFeature
::
DISABLED
)
expect
(
described_class
.
with_wiki_enabled
).
to
include
(
project
)
expect
(
described_class
.
with_wiki_enabled
).
to
include
(
project
)
expect
(
described_class
.
with_wiki_enabled
).
not_to
include
(
project1
)
expect
(
described_class
.
with_wiki_enabled
).
not_to
include
(
project1
)
...
@@ -201,7 +201,7 @@ describe Project do
...
@@ -201,7 +201,7 @@ describe Project do
context
'#mark_stuck_remote_mirrors_as_failed!'
do
context
'#mark_stuck_remote_mirrors_as_failed!'
do
it
'fails stuck remote mirrors'
do
it
'fails stuck remote mirrors'
do
project
=
create
(
:project
,
:re
mote_mirror
,
:repository
)
project
=
create
(
:project
,
:re
pository
,
:remote_mirror
)
project
.
remote_mirrors
.
first
.
update_attributes
(
project
.
remote_mirrors
.
first
.
update_attributes
(
update_status: :started
,
update_status: :started
,
...
@@ -215,7 +215,7 @@ describe Project do
...
@@ -215,7 +215,7 @@ describe Project do
end
end
context
'mirror'
do
context
'mirror'
do
subject
{
build
(
:
empty_
project
,
mirror:
true
)
}
subject
{
build
(
:project
,
mirror:
true
)
}
it
{
is_expected
.
to
validate_presence_of
(
:import_url
)
}
it
{
is_expected
.
to
validate_presence_of
(
:import_url
)
}
it
{
is_expected
.
to
validate_presence_of
(
:mirror_user
)
}
it
{
is_expected
.
to
validate_presence_of
(
:mirror_user
)
}
...
@@ -266,13 +266,13 @@ describe Project do
...
@@ -266,13 +266,13 @@ describe Project do
end
end
it
'creates mirror data when enabled'
do
it
'creates mirror data when enabled'
do
project2
=
create
(
:
empty_
project
,
:mirror
,
mirror:
false
)
project2
=
create
(
:project
,
:mirror
,
mirror:
false
)
expect
{
project2
.
update_attributes
(
mirror:
true
)
}.
to
change
{
ProjectMirrorData
.
count
}.
from
(
0
).
to
(
1
)
expect
{
project2
.
update_attributes
(
mirror:
true
)
}.
to
change
{
ProjectMirrorData
.
count
}.
from
(
0
).
to
(
1
)
end
end
it
'destroys mirror data when disabled'
do
it
'destroys mirror data when disabled'
do
project2
=
create
(
:
empty_
project
,
:mirror
)
project2
=
create
(
:project
,
:mirror
)
expect
{
project2
.
update_attributes
(
mirror:
false
)
}.
to
change
{
ProjectMirrorData
.
count
}.
from
(
1
).
to
(
0
)
expect
{
project2
.
update_attributes
(
mirror:
false
)
}.
to
change
{
ProjectMirrorData
.
count
}.
from
(
1
).
to
(
0
)
end
end
...
@@ -490,7 +490,7 @@ describe Project do
...
@@ -490,7 +490,7 @@ describe Project do
end
end
describe
"#kerberos_url_to_repo"
do
describe
"#kerberos_url_to_repo"
do
let
(
:project
)
{
create
(
:
empty_
project
,
path:
"somewhere"
)
}
let
(
:project
)
{
create
(
:project
,
path:
"somewhere"
)
}
it
'returns valid kerberos url for this repo'
do
it
'returns valid kerberos url for this repo'
do
expect
(
project
.
kerberos_url_to_repo
).
to
eq
(
"
#{
Gitlab
.
config
.
build_gitlab_kerberos_url
}
/
#{
project
.
namespace
.
path
}
/somewhere.git"
)
expect
(
project
.
kerberos_url_to_repo
).
to
eq
(
"
#{
Gitlab
.
config
.
build_gitlab_kerberos_url
}
/
#{
project
.
namespace
.
path
}
/somewhere.git"
)
...
@@ -678,7 +678,7 @@ describe Project do
...
@@ -678,7 +678,7 @@ describe Project do
end
end
describe
'repository size restrictions'
do
describe
'repository size restrictions'
do
let
(
:project
)
{
build
(
:
empty_
project
)
}
let
(
:project
)
{
build
(
:project
)
}
before
do
before
do
allow_any_instance_of
(
ApplicationSetting
).
to
receive
(
:repository_size_limit
).
and_return
(
50
)
allow_any_instance_of
(
ApplicationSetting
).
to
receive
(
:repository_size_limit
).
and_return
(
50
)
...
@@ -728,7 +728,7 @@ describe Project do
...
@@ -728,7 +728,7 @@ describe Project do
describe
'#above_size_limit?'
do
describe
'#above_size_limit?'
do
let
(
:project
)
do
let
(
:project
)
do
create
(
:
empty_
project
,
create
(
:project
,
statistics:
build
(
:project_statistics
))
statistics:
build
(
:project_statistics
))
end
end
...
@@ -754,7 +754,7 @@ describe Project do
...
@@ -754,7 +754,7 @@ describe Project do
describe
'#repository_size_limit column'
do
describe
'#repository_size_limit column'
do
it
'support values up to 8 exabytes'
do
it
'support values up to 8 exabytes'
do
project
=
create
(
:
empty_
project
)
project
=
create
(
:project
)
project
.
update_column
(
:repository_size_limit
,
8
.
exabytes
-
1
)
project
.
update_column
(
:repository_size_limit
,
8
.
exabytes
-
1
)
project
.
reload
project
.
reload
...
@@ -844,7 +844,7 @@ describe Project do
...
@@ -844,7 +844,7 @@ describe Project do
end
end
describe
'#cache_has_external_wiki'
do
describe
'#cache_has_external_wiki'
do
let
(
:project
)
{
create
(
:
empty_
project
,
has_external_wiki:
nil
)
}
let
(
:project
)
{
create
(
:project
,
has_external_wiki:
nil
)
}
it
'stores true if there is any external_wikis'
do
it
'stores true if there is any external_wikis'
do
services
=
double
(
:service
,
external_wikis:
[
ExternalWikiService
.
new
])
services
=
double
(
:service
,
external_wikis:
[
ExternalWikiService
.
new
])
...
@@ -1627,7 +1627,7 @@ describe Project do
...
@@ -1627,7 +1627,7 @@ describe Project do
describe
'handling import URL'
do
describe
'handling import URL'
do
context
'when project is a mirror'
do
context
'when project is a mirror'
do
it
'returns the full URL'
do
it
'returns the full URL'
do
project
=
create
(
:
empty_
project
,
:mirror
,
import_url:
'http://user:pass@test.com'
)
project
=
create
(
:project
,
:mirror
,
import_url:
'http://user:pass@test.com'
)
project
.
import_finish
project
.
import_finish
...
@@ -1637,7 +1637,7 @@ describe Project do
...
@@ -1637,7 +1637,7 @@ describe Project do
context
'when project is not a mirror'
do
context
'when project is not a mirror'
do
it
'returns the sanitized URL'
do
it
'returns the sanitized URL'
do
project
=
create
(
:
empty_
project
,
import_status:
'started'
,
import_url:
'http://user:pass@test.com'
)
project
=
create
(
:project
,
import_status:
'started'
,
import_url:
'http://user:pass@test.com'
)
project
.
import_finish
project
.
import_finish
...
@@ -1819,7 +1819,7 @@ describe Project do
...
@@ -1819,7 +1819,7 @@ describe Project do
end
end
context
'with a mirrored project'
do
context
'with a mirrored project'
do
let
(
:project
)
{
create
(
:
empty_
project
,
:mirror
)
}
let
(
:project
)
{
create
(
:project
,
:mirror
)
}
it
'calls RepositoryImportWorker and inserts in front of the mirror scheduler queue'
do
it
'calls RepositoryImportWorker and inserts in front of the mirror scheduler queue'
do
allow_any_instance_of
(
described_class
).
to
receive
(
:repository_exists?
).
and_return
(
false
,
true
)
allow_any_instance_of
(
described_class
).
to
receive
(
:repository_exists?
).
and_return
(
false
,
true
)
...
@@ -1869,7 +1869,7 @@ describe Project do
...
@@ -1869,7 +1869,7 @@ describe Project do
end
end
it
'does not index the repository'
do
it
'does not index the repository'
do
project
=
create
(
:
empty_
project
,
:import_started
,
import_type: :github
)
project
=
create
(
:project
,
:import_started
,
import_type: :github
)
expect
(
ElasticCommitIndexerWorker
).
not_to
receive
(
:perform_async
)
expect
(
ElasticCommitIndexerWorker
).
not_to
receive
(
:perform_async
)
...
@@ -1878,7 +1878,7 @@ describe Project do
...
@@ -1878,7 +1878,7 @@ describe Project do
end
end
context
'elasticsearch indexing enabled'
do
context
'elasticsearch indexing enabled'
do
let
(
:project
)
{
create
(
:
empty_
project
,
:import_started
,
import_type: :github
)
}
let
(
:project
)
{
create
(
:project
,
:import_started
,
import_type: :github
)
}
before
do
before
do
stub_application_setting
(
elasticsearch_indexing:
true
)
stub_application_setting
(
elasticsearch_indexing:
true
)
...
@@ -2009,7 +2009,7 @@ describe Project do
...
@@ -2009,7 +2009,7 @@ describe Project do
describe
'#updating_mirror?'
do
describe
'#updating_mirror?'
do
context
'when repository is empty'
do
context
'when repository is empty'
do
it
'returns false'
do
it
'returns false'
do
project
=
create
(
:
empty_
project
,
:mirror
,
:import_started
)
project
=
create
(
:project
,
:mirror
,
:import_started
)
expect
(
project
.
updating_mirror?
).
to
be
false
expect
(
project
.
updating_mirror?
).
to
be
false
end
end
...
@@ -2017,7 +2017,7 @@ describe Project do
...
@@ -2017,7 +2017,7 @@ describe Project do
context
'when project is not a mirror'
do
context
'when project is not a mirror'
do
it
'returns false'
do
it
'returns false'
do
project
=
create
(
:
empty_
project
,
:import_started
)
project
=
create
(
:project
,
:import_started
)
expect
(
project
.
updating_mirror?
).
to
be
false
expect
(
project
.
updating_mirror?
).
to
be
false
end
end
...
@@ -2035,7 +2035,7 @@ describe Project do
...
@@ -2035,7 +2035,7 @@ describe Project do
describe
'#force_import_job!'
do
describe
'#force_import_job!'
do
it
'sets next execution timestamp to now and schedules UpdateAllMirrorsWorker'
do
it
'sets next execution timestamp to now and schedules UpdateAllMirrorsWorker'
do
timestamp
=
Time
.
now
timestamp
=
Time
.
now
project
=
create
(
:
empty_
project
,
:mirror
)
project
=
create
(
:project
,
:mirror
)
project
.
mirror_data
.
update_attributes
(
next_execution_timestamp:
timestamp
-
3
.
minutes
)
project
.
mirror_data
.
update_attributes
(
next_execution_timestamp:
timestamp
-
3
.
minutes
)
...
@@ -2062,7 +2062,7 @@ describe Project do
...
@@ -2062,7 +2062,7 @@ describe Project do
context
'without mirror'
do
context
'without mirror'
do
it
'returns nil'
do
it
'returns nil'
do
project
=
create
(
:
empty_
project
)
project
=
create
(
:project
)
expect
(
project
.
add_import_job
).
to
be_nil
expect
(
project
.
add_import_job
).
to
be_nil
end
end
...
@@ -2070,7 +2070,7 @@ describe Project do
...
@@ -2070,7 +2070,7 @@ describe Project do
context
'without repository'
do
context
'without repository'
do
it
'schedules RepositoryImportWorker'
do
it
'schedules RepositoryImportWorker'
do
project
=
create
(
:
empty_
project
,
import_url:
generate
(
:url
))
project
=
create
(
:project
,
import_url:
generate
(
:url
))
expect
(
RepositoryImportWorker
).
to
receive
(
:perform_async
).
with
(
project
.
id
)
expect
(
RepositoryImportWorker
).
to
receive
(
:perform_async
).
with
(
project
.
id
)
...
@@ -2188,8 +2188,8 @@ describe Project do
...
@@ -2188,8 +2188,8 @@ describe Project do
end
end
context
'with valid paths'
do
context
'with valid paths'
do
let!
(
:project1
)
{
create
(
:
empty_
project
)
}
let!
(
:project1
)
{
create
(
:project
)
}
let!
(
:project2
)
{
create
(
:
empty_
project
)
}
let!
(
:project2
)
{
create
(
:project
)
}
it
'returns the projects matching the paths'
do
it
'returns the projects matching the paths'
do
projects
=
described_class
.
where_full_path_in
([
project1
.
full_path
,
projects
=
described_class
.
where_full_path_in
([
project1
.
full_path
,
...
@@ -2208,7 +2208,7 @@ describe Project do
...
@@ -2208,7 +2208,7 @@ describe Project do
end
end
describe
'#find_path_lock'
do
describe
'#find_path_lock'
do
let
(
:project
)
{
create
:
empty_
project
}
let
(
:project
)
{
create
:project
}
let
(
:path_lock
)
{
create
:path_lock
,
project:
project
}
let
(
:path_lock
)
{
create
:path_lock
,
project:
project
}
let
(
:path
)
{
path_lock
.
path
}
let
(
:path
)
{
path_lock
.
path
}
...
@@ -2349,13 +2349,13 @@ describe Project do
...
@@ -2349,13 +2349,13 @@ describe Project do
end
end
describe
'#approver_group_ids='
do
describe
'#approver_group_ids='
do
let
(
:project
)
{
create
(
:
empty_
project
)
}
let
(
:project
)
{
create
(
:project
)
}
it
'create approver_groups'
do
it
'create approver_groups'
do
group
=
create
:group
group
=
create
:group
group1
=
create
:group
group1
=
create
:group
project
=
create
:
empty_
project
project
=
create
:project
project
.
approver_group_ids
=
"
#{
group
.
id
}
,
#{
group1
.
id
}
"
project
.
approver_group_ids
=
"
#{
group
.
id
}
,
#{
group1
.
id
}
"
project
.
save!
project
.
save!
...
@@ -2506,7 +2506,7 @@ describe Project do
...
@@ -2506,7 +2506,7 @@ describe Project do
describe
'#create_mirror_data'
do
describe
'#create_mirror_data'
do
it
'it is called after save'
do
it
'it is called after save'
do
project
=
create
(
:
empty_
project
)
project
=
create
(
:project
)
expect
(
project
).
to
receive
(
:create_mirror_data
)
expect
(
project
).
to
receive
(
:create_mirror_data
)
...
...
spec/policies/ee/merge_request_policy_spec.rb
View file @
f81df0d4
...
@@ -9,8 +9,8 @@ describe MergeRequestPolicy do
...
@@ -9,8 +9,8 @@ describe MergeRequestPolicy do
let
(
:fork_developer
)
{
create
(
:user
)
}
let
(
:fork_developer
)
{
create
(
:user
)
}
let
(
:fork_master
)
{
create
(
:user
)
}
let
(
:fork_master
)
{
create
(
:user
)
}
let
(
:project
)
{
create
(
:
empty_
project
,
:public
)
}
let
(
:project
)
{
create
(
:project
,
:public
)
}
let
(
:fork_project
)
{
create
(
:
empty_
project
,
:public
,
forked_from_project:
project
)
}
let
(
:fork_project
)
{
create
(
:project
,
:public
,
forked_from_project:
project
)
}
let
(
:merge_request
)
{
create
(
:merge_request
,
source_project:
project
,
target_project:
project
)
}
let
(
:merge_request
)
{
create
(
:merge_request
,
source_project:
project
,
target_project:
project
)
}
let
(
:fork_merge_request
)
{
create
(
:merge_request
,
author:
fork_developer
,
source_project:
fork_project
,
target_project:
project
)
}
let
(
:fork_merge_request
)
{
create
(
:merge_request
,
author:
fork_developer
,
source_project:
fork_project
,
target_project:
project
)
}
...
...
spec/requests/api/ee/issues_spec.rb
View file @
f81df0d4
...
@@ -5,7 +5,7 @@ describe API::Issues do # rubocop:disable RSpec/FilePath
...
@@ -5,7 +5,7 @@ describe API::Issues do # rubocop:disable RSpec/FilePath
set
(
:user
)
{
create
(
:user
)
}
set
(
:user
)
{
create
(
:user
)
}
set
(
:project
)
do
set
(
:project
)
do
create
(
:
empty_
project
,
:public
,
creator_id:
user
.
id
,
namespace:
user
.
namespace
)
create
(
:project
,
:public
,
creator_id:
user
.
id
,
namespace:
user
.
namespace
)
end
end
let
(
:user2
)
{
create
(
:user
)
}
let
(
:user2
)
{
create
(
:user
)
}
...
...
spec/requests/api/geo_spec.rb
View file @
f81df0d4
...
@@ -208,7 +208,7 @@ describe API::Geo do
...
@@ -208,7 +208,7 @@ describe API::Geo do
describe
'GET /geo/transfers/file/1'
do
describe
'GET /geo/transfers/file/1'
do
let!
(
:secondary_node
)
{
create
(
:geo_node
)
}
let!
(
:secondary_node
)
{
create
(
:geo_node
)
}
let
(
:project
)
{
create
(
:
empty_
project
)
}
let
(
:project
)
{
create
(
:project
)
}
let
(
:upload
)
{
Upload
.
find_by
(
model:
project
,
uploader:
'FileUploader'
)
}
let
(
:upload
)
{
Upload
.
find_by
(
model:
project
,
uploader:
'FileUploader'
)
}
let
(
:transfer
)
{
Gitlab
::
Geo
::
FileTransfer
.
new
(
:file
,
upload
)
}
let
(
:transfer
)
{
Gitlab
::
Geo
::
FileTransfer
.
new
(
:file
,
upload
)
}
let
(
:req_header
)
{
Gitlab
::
Geo
::
TransferRequest
.
new
(
transfer
.
request_data
).
headers
}
let
(
:req_header
)
{
Gitlab
::
Geo
::
TransferRequest
.
new
(
transfer
.
request_data
).
headers
}
...
...
spec/requests/api/issue_links_spec.rb
View file @
f81df0d4
...
@@ -2,7 +2,7 @@ require 'spec_helper'
...
@@ -2,7 +2,7 @@ require 'spec_helper'
describe
API
::
IssueLinks
do
describe
API
::
IssueLinks
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:project
)
{
create
(
:
empty_
project
)
}
let
(
:project
)
{
create
(
:project
)
}
let
(
:issue
)
{
create
(
:issue
,
project:
project
)
}
let
(
:issue
)
{
create
(
:issue
,
project:
project
)
}
before
do
before
do
...
@@ -60,7 +60,7 @@ describe API::IssueLinks do
...
@@ -60,7 +60,7 @@ describe API::IssueLinks do
context
'given target issue not found'
do
context
'given target issue not found'
do
it
'returns 404'
do
it
'returns 404'
do
target_project
=
create
(
:
empty_
project
,
:public
)
target_project
=
create
(
:project
,
:public
)
post
api
(
"/projects/
#{
project
.
id
}
/issues/
#{
issue
.
iid
}
/links"
,
user
),
post
api
(
"/projects/
#{
project
.
id
}
/issues/
#{
issue
.
iid
}
/links"
,
user
),
target_project_id:
target_project
.
id
,
target_issue_iid:
999
target_project_id:
target_project
.
id
,
target_issue_iid:
999
...
@@ -72,7 +72,7 @@ describe API::IssueLinks do
...
@@ -72,7 +72,7 @@ describe API::IssueLinks do
context
'when user does not have write access to given issue'
do
context
'when user does not have write access to given issue'
do
it
'returns 404'
do
it
'returns 404'
do
unauthorized_project
=
create
(
:
empty_
project
)
unauthorized_project
=
create
(
:project
)
target_issue
=
create
(
:issue
,
project:
unauthorized_project
)
target_issue
=
create
(
:issue
,
project:
unauthorized_project
)
unauthorized_project
.
add_guest
(
user
)
unauthorized_project
.
add_guest
(
user
)
...
@@ -86,7 +86,7 @@ describe API::IssueLinks do
...
@@ -86,7 +86,7 @@ describe API::IssueLinks do
context
'when trying to relate to a confidential issue'
do
context
'when trying to relate to a confidential issue'
do
it
'returns 404'
do
it
'returns 404'
do
project
=
create
(
:
empty_
project
,
:public
)
project
=
create
(
:project
,
:public
)
target_issue
=
create
(
:issue
,
:confidential
,
project:
project
)
target_issue
=
create
(
:issue
,
:confidential
,
project:
project
)
post
api
(
"/projects/
#{
project
.
id
}
/issues/
#{
issue
.
iid
}
/links"
,
user
),
post
api
(
"/projects/
#{
project
.
id
}
/issues/
#{
issue
.
iid
}
/links"
,
user
),
...
@@ -99,7 +99,7 @@ describe API::IssueLinks do
...
@@ -99,7 +99,7 @@ describe API::IssueLinks do
context
'when trying to relate to a private project issue'
do
context
'when trying to relate to a private project issue'
do
it
'returns 404'
do
it
'returns 404'
do
project
=
create
(
:
empty_
project
,
:private
)
project
=
create
(
:project
,
:private
)
target_issue
=
create
(
:issue
,
project:
project
)
target_issue
=
create
(
:issue
,
project:
project
)
post
api
(
"/projects/
#{
project
.
id
}
/issues/
#{
issue
.
iid
}
/links"
,
user
),
post
api
(
"/projects/
#{
project
.
id
}
/issues/
#{
issue
.
iid
}
/links"
,
user
),
...
@@ -150,7 +150,7 @@ describe API::IssueLinks do
...
@@ -150,7 +150,7 @@ describe API::IssueLinks do
context
'when authenticated'
do
context
'when authenticated'
do
context
'when user does not have write access to given issue link'
do
context
'when user does not have write access to given issue link'
do
it
'returns 404'
do
it
'returns 404'
do
unauthorized_project
=
create
(
:
empty_
project
)
unauthorized_project
=
create
(
:project
)
target_issue
=
create
(
:issue
,
project:
unauthorized_project
)
target_issue
=
create
(
:issue
,
project:
unauthorized_project
)
issue_link
=
create
(
:issue_link
,
source:
issue
,
target:
target_issue
)
issue_link
=
create
(
:issue_link
,
source:
issue
,
target:
target_issue
)
unauthorized_project
.
add_guest
(
user
)
unauthorized_project
.
add_guest
(
user
)
...
@@ -173,7 +173,7 @@ describe API::IssueLinks do
...
@@ -173,7 +173,7 @@ describe API::IssueLinks do
context
'when trying to delete a link with a private project issue'
do
context
'when trying to delete a link with a private project issue'
do
it
'returns 404'
do
it
'returns 404'
do
project
=
create
(
:
empty_
project
,
:private
)
project
=
create
(
:project
,
:private
)
target_issue
=
create
(
:issue
,
project:
project
)
target_issue
=
create
(
:issue
,
project:
project
)
issue_link
=
create
(
:issue_link
,
source:
issue
,
target:
target_issue
)
issue_link
=
create
(
:issue_link
,
source:
issue
,
target:
target_issue
)
...
...
spec/requests/api/members_spec.rb
View file @
f81df0d4
...
@@ -185,7 +185,7 @@ describe API::Members do
...
@@ -185,7 +185,7 @@ describe API::Members do
context
'project in a group'
do
context
'project in a group'
do
it
'returns a 405 method not allowed error when group membership lock is enabled'
do
it
'returns a 405 method not allowed error when group membership lock is enabled'
do
group_with_membership_locked
=
create
(
:group
,
membership_lock:
true
)
group_with_membership_locked
=
create
(
:group
,
membership_lock:
true
)
project
=
create
(
:
empty_
project
,
group:
group_with_membership_locked
)
project
=
create
(
:project
,
group:
group_with_membership_locked
)
project
.
group
.
add_owner
(
master
)
project
.
group
.
add_owner
(
master
)
post
api
(
"/projects/
#{
project
.
id
}
/members"
,
master
),
post
api
(
"/projects/
#{
project
.
id
}
/members"
,
master
),
...
...
spec/requests/api/variables_ee_spec.rb
View file @
f81df0d4
...
@@ -2,7 +2,7 @@ require 'spec_helper'
...
@@ -2,7 +2,7 @@ require 'spec_helper'
describe
API
::
Variables
do
describe
API
::
Variables
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:project
)
{
create
(
:
empty_
project
)
}
let
(
:project
)
{
create
(
:project
)
}
describe
'POST /projects/:id/variables'
do
describe
'POST /projects/:id/variables'
do
context
'with variable environment scope available'
do
context
'with variable environment scope available'
do
...
...
spec/routing/webhook_routes_spec.rb
View file @
f81df0d4
...
@@ -2,7 +2,7 @@ require "spec_helper"
...
@@ -2,7 +2,7 @@ require "spec_helper"
describe
"routes to the proper webhooks controller"
,
type: :routing
do
describe
"routes to the proper webhooks controller"
,
type: :routing
do
context
'with a project context'
do
context
'with a project context'
do
let
(
:project
)
{
create
(
:
empty_
project
)
}
let
(
:project
)
{
create
(
:project
)
}
let
(
:project_hook
)
{
create
(
:project_hook
)
}
let
(
:project_hook
)
{
create
(
:project_hook
)
}
it
"routes the test action"
do
it
"routes the test action"
do
...
...
spec/services/audit_event_service_spec.rb
View file @
f81df0d4
require
'spec_helper'
require
'spec_helper'
describe
AuditEventService
do
describe
AuditEventService
do
let
(
:project
)
{
create
(
:
empty_
project
)
}
let
(
:project
)
{
create
(
:project
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:project_member
)
{
create
(
:project_member
,
user:
user
)
}
let
(
:project_member
)
{
create
(
:project_member
,
user:
user
)
}
let
(
:service
)
{
described_class
.
new
(
user
,
project
,
{
action: :destroy
})
}
let
(
:service
)
{
described_class
.
new
(
user
,
project
,
{
action: :destroy
})
}
...
...
spec/services/boards/destroy_service_spec.rb
View file @
f81df0d4
...
@@ -2,7 +2,7 @@ require 'spec_helper'
...
@@ -2,7 +2,7 @@ require 'spec_helper'
describe
Boards
::
DestroyService
do
describe
Boards
::
DestroyService
do
describe
'#execute'
do
describe
'#execute'
do
let
(
:project
)
{
create
(
:
empty_
project
)
}
let
(
:project
)
{
create
(
:project
)
}
let!
(
:board
)
{
create
(
:board
,
project:
project
)
}
let!
(
:board
)
{
create
(
:board
,
project:
project
)
}
subject
(
:service
)
{
described_class
.
new
(
project
,
double
)
}
subject
(
:service
)
{
described_class
.
new
(
project
,
double
)
}
...
...
spec/services/boards/update_service_spec.rb
View file @
f81df0d4
...
@@ -2,7 +2,7 @@ require 'spec_helper'
...
@@ -2,7 +2,7 @@ require 'spec_helper'
describe
Boards
::
UpdateService
do
describe
Boards
::
UpdateService
do
describe
'#execute'
do
describe
'#execute'
do
let
(
:project
)
{
create
(
:
empty_
project
)
}
let
(
:project
)
{
create
(
:project
)
}
let!
(
:board
)
{
create
(
:board
,
project:
project
,
name:
'Backend'
)
}
let!
(
:board
)
{
create
(
:board
,
project:
project
,
name:
'Backend'
)
}
it
"updates board's name"
do
it
"updates board's name"
do
...
...
spec/services/ee/boards/create_service_spec.rb
View file @
f81df0d4
...
@@ -2,7 +2,7 @@ require 'spec_helper'
...
@@ -2,7 +2,7 @@ require 'spec_helper'
describe
Boards
::
CreateService
do
describe
Boards
::
CreateService
do
describe
'#execute'
do
describe
'#execute'
do
let
(
:project
)
{
create
(
:
empty_
project
)
}
let
(
:project
)
{
create
(
:project
)
}
context
'With the feature available'
do
context
'With the feature available'
do
before
do
before
do
...
...
spec/services/ee/boards/list_service_spec.rb
View file @
f81df0d4
require
'spec_helper'
require
'spec_helper'
describe
Boards
::
ListService
do
describe
Boards
::
ListService
do
let
(
:project
)
{
create
(
:
empty_
project
)
}
let
(
:project
)
{
create
(
:project
)
}
let
(
:service
)
{
described_class
.
new
(
project
,
double
)
}
let
(
:service
)
{
described_class
.
new
(
project
,
double
)
}
before
do
before
do
...
...
spec/services/ee/ci/register_job_service_spec.rb
View file @
f81df0d4
...
@@ -2,7 +2,7 @@ require 'spec_helper'
...
@@ -2,7 +2,7 @@ require 'spec_helper'
module
Ci
module
Ci
describe
RegisterJobService
do
describe
RegisterJobService
do
let!
(
:project
)
{
create
:
empty_
project
,
shared_runners_enabled:
false
}
let!
(
:project
)
{
create
:project
,
shared_runners_enabled:
false
}
let!
(
:pipeline
)
{
create
:ci_empty_pipeline
,
project:
project
}
let!
(
:pipeline
)
{
create
:ci_empty_pipeline
,
project:
project
}
let!
(
:pending_build
)
{
create
:ci_build
,
pipeline:
pipeline
}
let!
(
:pending_build
)
{
create
:ci_build
,
pipeline:
pipeline
}
let
(
:shared_runner
)
{
create
(
:ci_runner
,
:shared
)
}
let
(
:shared_runner
)
{
create
(
:ci_runner
,
:shared
)
}
...
...
spec/services/ee/issues/build_service_spec.rb
View file @
f81df0d4
...
@@ -11,7 +11,7 @@ describe Issues::BuildService do # rubocop:disable RSpec/FilePath
...
@@ -11,7 +11,7 @@ describe Issues::BuildService do # rubocop:disable RSpec/FilePath
context
'with an issue template'
do
context
'with an issue template'
do
describe
'#execute'
do
describe
'#execute'
do
it
'fills in the template in the description'
do
it
'fills in the template in the description'
do
project
=
build
(
:
empty_
project
,
issues_template:
'Work hard, play hard!'
)
project
=
build
(
:project
,
issues_template:
'Work hard, play hard!'
)
service
=
described_class
.
new
(
project
,
user
)
service
=
described_class
.
new
(
project
,
user
)
issue
=
service
.
execute
issue
=
service
.
execute
...
...
spec/services/ee/merge_requests/build_service_spec.rb
View file @
f81df0d4
...
@@ -28,7 +28,7 @@ describe MergeRequests::BuildService do # rubocop:disable RSpec/FilePath
...
@@ -28,7 +28,7 @@ describe MergeRequests::BuildService do # rubocop:disable RSpec/FilePath
context
'project default template configured'
do
context
'project default template configured'
do
let
(
:template
)
{
"I am the template, you fill me in"
}
let
(
:template
)
{
"I am the template, you fill me in"
}
let
(
:project
)
{
create
(
:
empty_
project
,
merge_requests_template:
template
)
}
let
(
:project
)
{
create
(
:project
,
merge_requests_template:
template
)
}
context
'issuable default templates feature not available'
do
context
'issuable default templates feature not available'
do
before
do
before
do
...
...
spec/services/ee/quick_actions/interpret_service_spec.rb
View file @
f81df0d4
...
@@ -4,7 +4,7 @@ describe QuickActions::InterpretService do # rubocop:disable RSpec/FilePath
...
@@ -4,7 +4,7 @@ describe QuickActions::InterpretService do # rubocop:disable RSpec/FilePath
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:developer
)
{
create
(
:user
)
}
let
(
:developer
)
{
create
(
:user
)
}
let
(
:developer2
)
{
create
(
:user
)
}
let
(
:developer2
)
{
create
(
:user
)
}
let
(
:project
)
{
create
(
:
empty_
project
,
:public
)
}
let
(
:project
)
{
create
(
:project
,
:public
)
}
let
(
:issue
)
{
create
(
:issue
,
project:
project
)
}
let
(
:issue
)
{
create
(
:issue
,
project:
project
)
}
let
(
:service
)
{
described_class
.
new
(
project
,
developer
)
}
let
(
:service
)
{
described_class
.
new
(
project
,
developer
)
}
...
...
spec/services/ee/wiki_pages/create_service_spec.rb
View file @
f81df0d4
require
'spec_helper'
require
'spec_helper'
describe
WikiPages
::
CreateService
do
describe
WikiPages
::
CreateService
do
let
(
:project
)
{
create
(
:
empty_
project
)
}
let
(
:project
)
{
create
(
:project
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:opts
)
do
let
(
:opts
)
do
...
...
spec/services/ee/wiki_pages/destroy_service_spec.rb
View file @
f81df0d4
require
'spec_helper'
require
'spec_helper'
describe
WikiPages
::
DestroyService
do
describe
WikiPages
::
DestroyService
do
let
(
:project
)
{
create
(
:
empty_
project
)
}
let
(
:project
)
{
create
(
:project
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:page
)
{
create
(
:wiki_page
)
}
let
(
:page
)
{
create
(
:wiki_page
)
}
...
...
spec/services/ee/wiki_pages/update_service_spec.rb
View file @
f81df0d4
require
'spec_helper'
require
'spec_helper'
describe
WikiPages
::
UpdateService
do
describe
WikiPages
::
UpdateService
do
let
(
:project
)
{
create
(
:
empty_
project
)
}
let
(
:project
)
{
create
(
:project
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:page
)
{
create
(
:wiki_page
)
}
let
(
:page
)
{
create
(
:wiki_page
)
}
...
...
spec/services/geo/file_download_service_spec.rb
View file @
f81df0d4
...
@@ -42,7 +42,7 @@ describe Geo::FileDownloadService do
...
@@ -42,7 +42,7 @@ describe Geo::FileDownloadService do
end
end
context
'project avatar'
do
context
'project avatar'
do
let
(
:project
)
{
create
(
:
empty_
project
,
avatar:
fixture_file_upload
(
Rails
.
root
+
'spec/fixtures/dk.png'
,
'image/png'
))
}
let
(
:project
)
{
create
(
:project
,
avatar:
fixture_file_upload
(
Rails
.
root
+
'spec/fixtures/dk.png'
,
'image/png'
))
}
let
(
:upload
)
{
Upload
.
find_by
(
model:
project
,
uploader:
'AvatarUploader'
)
}
let
(
:upload
)
{
Upload
.
find_by
(
model:
project
,
uploader:
'AvatarUploader'
)
}
subject
{
described_class
.
new
(
:avatar
,
upload
.
id
)
}
subject
{
described_class
.
new
(
:avatar
,
upload
.
id
)
}
...
@@ -74,7 +74,7 @@ describe Geo::FileDownloadService do
...
@@ -74,7 +74,7 @@ describe Geo::FileDownloadService do
end
end
context
'with file upload'
do
context
'with file upload'
do
let
(
:project
)
{
create
(
:
empty_
project
)
}
let
(
:project
)
{
create
(
:project
)
}
let
(
:upload
)
{
Upload
.
find_by
(
model:
project
,
uploader:
'FileUploader'
)
}
let
(
:upload
)
{
Upload
.
find_by
(
model:
project
,
uploader:
'FileUploader'
)
}
subject
{
described_class
.
new
(
:file
,
upload
.
id
)
}
subject
{
described_class
.
new
(
:file
,
upload
.
id
)
}
...
...
spec/services/geo/file_upload_service_spec.rb
View file @
f81df0d4
...
@@ -53,7 +53,7 @@ describe Geo::FileUploadService do
...
@@ -53,7 +53,7 @@ describe Geo::FileUploadService do
end
end
context
'project avatar'
do
context
'project avatar'
do
let
(
:project
)
{
create
(
:
empty_
project
,
avatar:
fixture_file_upload
(
Rails
.
root
+
'spec/fixtures/dk.png'
,
'image/png'
))
}
let
(
:project
)
{
create
(
:project
,
avatar:
fixture_file_upload
(
Rails
.
root
+
'spec/fixtures/dk.png'
,
'image/png'
))
}
let
(
:upload
)
{
Upload
.
find_by
(
model:
project
,
uploader:
'AvatarUploader'
)
}
let
(
:upload
)
{
Upload
.
find_by
(
model:
project
,
uploader:
'AvatarUploader'
)
}
let
(
:params
)
{
{
id:
upload
.
id
,
type:
'avatar'
}
}
let
(
:params
)
{
{
id:
upload
.
id
,
type:
'avatar'
}
}
let
(
:file_transfer
)
{
Gitlab
::
Geo
::
FileTransfer
.
new
(
:avatar
,
upload
)
}
let
(
:file_transfer
)
{
Gitlab
::
Geo
::
FileTransfer
.
new
(
:avatar
,
upload
)
}
...
@@ -101,7 +101,7 @@ describe Geo::FileUploadService do
...
@@ -101,7 +101,7 @@ describe Geo::FileUploadService do
end
end
context
'file upload'
do
context
'file upload'
do
let
(
:project
)
{
create
(
:
empty_
project
)
}
let
(
:project
)
{
create
(
:project
)
}
let
(
:upload
)
{
Upload
.
find_by
(
model:
project
,
uploader:
'FileUploader'
)
}
let
(
:upload
)
{
Upload
.
find_by
(
model:
project
,
uploader:
'FileUploader'
)
}
let
(
:params
)
{
{
id:
upload
.
id
,
type:
'file'
}
}
let
(
:params
)
{
{
id:
upload
.
id
,
type:
'file'
}
}
let
(
:file_transfer
)
{
Gitlab
::
Geo
::
FileTransfer
.
new
(
:file
,
upload
)
}
let
(
:file_transfer
)
{
Gitlab
::
Geo
::
FileTransfer
.
new
(
:file
,
upload
)
}
...
...
spec/services/geo/repository_deleted_event_store_spec.rb
View file @
f81df0d4
require
'spec_helper'
require
'spec_helper'
describe
Geo
::
RepositoryDeletedEventStore
do
describe
Geo
::
RepositoryDeletedEventStore
do
let
(
:project
)
{
create
(
:
empty_
project
,
path:
'bar'
)
}
let
(
:project
)
{
create
(
:project
,
path:
'bar'
)
}
let!
(
:project_id
)
{
project
.
id
}
let!
(
:project_id
)
{
project
.
id
}
let!
(
:project_name
)
{
project
.
name
}
let!
(
:project_name
)
{
project
.
name
}
let!
(
:repo_path
)
{
project
.
full_path
}
let!
(
:repo_path
)
{
project
.
full_path
}
...
...
spec/services/geo/repository_renamed_event_store_spec.rb
View file @
f81df0d4
require
'spec_helper'
require
'spec_helper'
describe
Geo
::
RepositoryRenamedEventStore
do
describe
Geo
::
RepositoryRenamedEventStore
do
let
(
:project
)
{
create
(
:
empty_
project
,
path:
'bar'
)
}
let
(
:project
)
{
create
(
:project
,
path:
'bar'
)
}
let
(
:old_path
)
{
'foo'
}
let
(
:old_path
)
{
'foo'
}
let
(
:old_path_with_namespace
)
{
"
#{
project
.
namespace
.
full_path
}
/foo"
}
let
(
:old_path_with_namespace
)
{
"
#{
project
.
namespace
.
full_path
}
/foo"
}
...
...
spec/services/geo/repository_update_service_spec.rb
View file @
f81df0d4
require
'spec_helper'
require
'spec_helper'
describe
Geo
::
RepositoryUpdateService
do
describe
Geo
::
RepositoryUpdateService
do
let
(
:project
)
{
create
(
:
empty_
project
)
}
let
(
:project
)
{
create
(
:project
)
}
let
(
:clone_url
)
{
project
.
ssh_url_to_repo
}
let
(
:clone_url
)
{
project
.
ssh_url_to_repo
}
subject
{
described_class
.
new
(
project
,
clone_url
)
}
subject
{
described_class
.
new
(
project
,
clone_url
)
}
...
...
spec/services/issue_links/create_service_spec.rb
View file @
f81df0d4
...
@@ -3,7 +3,7 @@ require 'spec_helper'
...
@@ -3,7 +3,7 @@ require 'spec_helper'
describe
IssueLinks
::
CreateService
do
describe
IssueLinks
::
CreateService
do
describe
'#execute'
do
describe
'#execute'
do
let
(
:namespace
)
{
create
:namespace
}
let
(
:namespace
)
{
create
:namespace
}
let
(
:project
)
{
create
:
empty_
project
,
namespace:
namespace
}
let
(
:project
)
{
create
:project
,
namespace:
namespace
}
let
(
:issue
)
{
create
:issue
,
project:
project
}
let
(
:issue
)
{
create
:issue
,
project:
project
}
let
(
:user
)
{
create
:user
}
let
(
:user
)
{
create
:user
}
let
(
:params
)
do
let
(
:params
)
do
...
@@ -62,7 +62,7 @@ describe IssueLinks::CreateService do
...
@@ -62,7 +62,7 @@ describe IssueLinks::CreateService do
context
'when there is an issue to relate'
do
context
'when there is an issue to relate'
do
let
(
:issue_a
)
{
create
:issue
,
project:
project
}
let
(
:issue_a
)
{
create
:issue
,
project:
project
}
let
(
:another_project
)
{
create
:
empty_
project
,
namespace:
project
.
namespace
}
let
(
:another_project
)
{
create
:project
,
namespace:
project
.
namespace
}
let
(
:another_project_issue
)
{
create
:issue
,
project:
another_project
}
let
(
:another_project_issue
)
{
create
:issue
,
project:
another_project
}
let
(
:issue_a_ref
)
{
issue_a
.
to_reference
}
let
(
:issue_a_ref
)
{
issue_a
.
to_reference
}
...
...
spec/services/issue_links/destroy_service_spec.rb
View file @
f81df0d4
...
@@ -2,7 +2,7 @@ require 'spec_helper'
...
@@ -2,7 +2,7 @@ require 'spec_helper'
describe
IssueLinks
::
DestroyService
do
describe
IssueLinks
::
DestroyService
do
describe
'#execute'
do
describe
'#execute'
do
let
(
:project
)
{
create
(
:
empty_
project
)
}
let
(
:project
)
{
create
(
:project
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
subject
{
described_class
.
new
(
issue_link
,
user
).
execute
}
subject
{
described_class
.
new
(
issue_link
,
user
).
execute
}
...
@@ -37,7 +37,7 @@ describe IssueLinks::DestroyService do
...
@@ -37,7 +37,7 @@ describe IssueLinks::DestroyService do
end
end
context
'when failing to remove an issue link'
do
context
'when failing to remove an issue link'
do
let
(
:unauthorized_project
)
{
create
(
:
empty_
project
)
}
let
(
:unauthorized_project
)
{
create
(
:project
)
}
let
(
:issue_a
)
{
create
(
:issue
,
project:
project
)
}
let
(
:issue_a
)
{
create
(
:issue
,
project:
project
)
}
let
(
:issue_b
)
{
create
(
:issue
,
project:
unauthorized_project
)
}
let
(
:issue_b
)
{
create
(
:issue
,
project:
unauthorized_project
)
}
...
...
spec/services/issue_links/list_service_spec.rb
View file @
f81df0d4
...
@@ -38,7 +38,7 @@ describe IssueLinks::ListService do
...
@@ -38,7 +38,7 @@ describe IssueLinks::ListService do
it
'ensures no N+1 queries are made'
do
it
'ensures no N+1 queries are made'
do
control_count
=
ActiveRecord
::
QueryRecorder
.
new
{
subject
}.
count
control_count
=
ActiveRecord
::
QueryRecorder
.
new
{
subject
}.
count
project
=
create
:
empty_
project
,
:public
project
=
create
:project
,
:public
issue_x
=
create
:issue
,
project:
project
issue_x
=
create
:issue
,
project:
project
issue_y
=
create
:issue
,
project:
project
issue_y
=
create
:issue
,
project:
project
issue_z
=
create
:issue
,
project:
project
issue_z
=
create
:issue
,
project:
project
...
@@ -76,7 +76,7 @@ describe IssueLinks::ListService do
...
@@ -76,7 +76,7 @@ describe IssueLinks::ListService do
end
end
context
'referencing a public project issue'
do
context
'referencing a public project issue'
do
let
(
:public_project
)
{
create
:
empty_
project
,
:public
}
let
(
:public_project
)
{
create
:project
,
:public
}
let
(
:issue_b
)
{
create
:issue
,
project:
public_project
}
let
(
:issue_b
)
{
create
:issue
,
project:
public_project
}
let!
(
:issue_link
)
do
let!
(
:issue_link
)
do
...
@@ -158,7 +158,7 @@ describe IssueLinks::ListService do
...
@@ -158,7 +158,7 @@ describe IssueLinks::ListService do
context
'user can admin related issues just on target project'
do
context
'user can admin related issues just on target project'
do
let
(
:user_role
)
{
:guest
}
let
(
:user_role
)
{
:guest
}
let
(
:target_project
)
{
create
:
empty_
project
}
let
(
:target_project
)
{
create
:project
}
let
(
:referenced_issue
)
{
create
:issue
,
project:
target_project
}
let
(
:referenced_issue
)
{
create
:issue
,
project:
target_project
}
it
'returns no destroy relation path'
do
it
'returns no destroy relation path'
do
...
@@ -170,7 +170,7 @@ describe IssueLinks::ListService do
...
@@ -170,7 +170,7 @@ describe IssueLinks::ListService do
context
'user can admin related issues just on source project'
do
context
'user can admin related issues just on source project'
do
let
(
:user_role
)
{
:developer
}
let
(
:user_role
)
{
:developer
}
let
(
:target_project
)
{
create
:
empty_
project
}
let
(
:target_project
)
{
create
:project
}
let
(
:referenced_issue
)
{
create
:issue
,
project:
target_project
}
let
(
:referenced_issue
)
{
create
:issue
,
project:
target_project
}
it
'returns no destroy relation path'
do
it
'returns no destroy relation path'
do
...
...
spec/services/issues/export_csv_service_spec.rb
View file @
f81df0d4
...
@@ -2,7 +2,7 @@ require 'spec_helper'
...
@@ -2,7 +2,7 @@ require 'spec_helper'
describe
Issues
::
ExportCsvService
do
describe
Issues
::
ExportCsvService
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:project
)
{
create
(
:
empty_
project
,
:public
)
}
let
(
:project
)
{
create
(
:project
,
:public
)
}
let!
(
:issue
)
{
create
(
:issue
,
project:
project
,
author:
user
)
}
let!
(
:issue
)
{
create
(
:issue
,
project:
project
,
author:
user
)
}
let
(
:subject
)
{
described_class
.
new
(
Issue
.
all
)
}
let
(
:subject
)
{
described_class
.
new
(
Issue
.
all
)
}
...
...
spec/services/path_locks/lock_service_spec.rb
View file @
f81df0d4
...
@@ -2,7 +2,7 @@ require 'spec_helper'
...
@@ -2,7 +2,7 @@ require 'spec_helper'
describe
PathLocks
::
LockService
do
describe
PathLocks
::
LockService
do
let
(
:current_user
)
{
create
(
:user
)
}
let
(
:current_user
)
{
create
(
:user
)
}
let
(
:project
)
{
create
(
:
empty_
project
)
}
let
(
:project
)
{
create
(
:project
)
}
let
(
:path
)
{
'app/models'
}
let
(
:path
)
{
'app/models'
}
it
'locks path'
do
it
'locks path'
do
...
...
spec/services/projects/slack_application_install_service_spec.rb
View file @
f81df0d4
...
@@ -2,7 +2,7 @@ require 'spec_helper'
...
@@ -2,7 +2,7 @@ require 'spec_helper'
describe
Projects
::
SlackApplicationInstallService
do
describe
Projects
::
SlackApplicationInstallService
do
let!
(
:user
)
{
create
(
:user
)
}
let!
(
:user
)
{
create
(
:user
)
}
let!
(
:project
)
{
create
(
:
empty_
project
)
}
let!
(
:project
)
{
create
(
:project
)
}
def
service
(
params
=
{})
def
service
(
params
=
{})
Projects
::
SlackApplicationInstallService
.
new
(
project
,
user
,
params
)
Projects
::
SlackApplicationInstallService
.
new
(
project
,
user
,
params
)
...
...
spec/services/projects/update_mirror_service_spec.rb
View file @
f81df0d4
...
@@ -124,7 +124,7 @@ describe Projects::UpdateMirrorService do
...
@@ -124,7 +124,7 @@ describe Projects::UpdateMirrorService do
end
end
describe
"when is no mirror"
do
describe
"when is no mirror"
do
let
(
:project
)
{
build_stubbed
(
:
empty_
project
)
}
let
(
:project
)
{
build_stubbed
(
:project
)
}
it
"success"
do
it
"success"
do
expect
(
project
.
mirror?
).
to
eq
(
false
)
expect
(
project
.
mirror?
).
to
eq
(
false
)
...
...
spec/services/projects/update_service_spec.rb
View file @
f81df0d4
...
@@ -171,7 +171,7 @@ describe Projects::UpdateService, '#execute' do
...
@@ -171,7 +171,7 @@ describe Projects::UpdateService, '#execute' do
context
'repository_size_limit assignment as Bytes'
do
context
'repository_size_limit assignment as Bytes'
do
let
(
:admin_user
)
{
create
(
:user
,
admin:
true
)
}
let
(
:admin_user
)
{
create
(
:user
,
admin:
true
)
}
let
(
:project
)
{
create
(
:
empty_
project
,
repository_size_limit:
0
)
}
let
(
:project
)
{
create
(
:project
,
repository_size_limit:
0
)
}
context
'when param present'
do
context
'when param present'
do
let
(
:opts
)
{
{
repository_size_limit:
'100'
}
}
let
(
:opts
)
{
{
repository_size_limit:
'100'
}
}
...
...
spec/services/slash_commands/global_slack_handler_spec.rb
View file @
f81df0d4
require
'spec_helper'
require
'spec_helper'
describe
SlashCommands
::
GlobalSlackHandler
do
describe
SlashCommands
::
GlobalSlackHandler
do
let
(
:project
)
{
create
(
:
empty_
project
)
}
let
(
:project
)
{
create
(
:project
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:verification_token
)
{
'123'
}
let
(
:verification_token
)
{
'123'
}
...
...
spec/services/update_build_minutes_service_spec.rb
View file @
f81df0d4
...
@@ -3,7 +3,7 @@ require 'spec_helper'
...
@@ -3,7 +3,7 @@ require 'spec_helper'
describe
UpdateBuildMinutesService
do
describe
UpdateBuildMinutesService
do
context
'#perform'
do
context
'#perform'
do
let
(
:namespace
)
{
create
(
:namespace
,
shared_runners_minutes_limit:
100
)
}
let
(
:namespace
)
{
create
(
:namespace
,
shared_runners_minutes_limit:
100
)
}
let
(
:project
)
{
create
(
:
empty_
project
,
namespace:
namespace
)
}
let
(
:project
)
{
create
(
:project
,
namespace:
namespace
)
}
let
(
:pipeline
)
{
create
(
:ci_pipeline
,
project:
project
)
}
let
(
:pipeline
)
{
create
(
:ci_pipeline
,
project:
project
)
}
let
(
:build
)
do
let
(
:build
)
do
create
(
:ci_build
,
:success
,
create
(
:ci_build
,
:success
,
...
...
spec/services/users/destroy_service_spec.rb
View file @
f81df0d4
...
@@ -177,7 +177,7 @@ describe Users::DestroyService do
...
@@ -177,7 +177,7 @@ describe Users::DestroyService do
end
end
it
'updates the mirror_user to one of the group owners'
do
it
'updates the mirror_user to one of the group owners'
do
project
=
create
(
:
empty_
project
,
namespace_id:
group
.
id
,
creator:
group_owner
,
mirror_user:
mirror_user
)
project
=
create
(
:project
,
namespace_id:
group
.
id
,
creator:
group_owner
,
mirror_user:
mirror_user
)
service
.
execute
(
mirror_user
)
service
.
execute
(
mirror_user
)
expect
(
project
.
reload
.
mirror_user
).
to
eq
group_owner
expect
(
project
.
reload
.
mirror_user
).
to
eq
group_owner
...
...
spec/views/shared/issuable/_approvals.html.haml_spec.rb
View file @
f81df0d4
...
@@ -2,7 +2,7 @@ require 'spec_helper'
...
@@ -2,7 +2,7 @@ require 'spec_helper'
describe
'shared/issuable/_approvals.html.haml'
do
describe
'shared/issuable/_approvals.html.haml'
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:project
)
{
build
(
:
empty_
project
)
}
let
(
:project
)
{
build
(
:project
)
}
let
(
:merge_request
)
{
create
(
:merge_request
,
source_project:
project
,
target_project:
project
)
}
let
(
:merge_request
)
{
create
(
:merge_request
,
source_project:
project
,
target_project:
project
)
}
let
(
:form
)
{
double
(
'form'
)
}
let
(
:form
)
{
double
(
'form'
)
}
...
...
spec/workers/admin_emails_worker_spec.rb
View file @
f81df0d4
...
@@ -3,7 +3,7 @@ require 'spec_helper'
...
@@ -3,7 +3,7 @@ require 'spec_helper'
describe
AdminEmailsWorker
do
describe
AdminEmailsWorker
do
context
"recipients"
do
context
"recipients"
do
let
(
:group
)
{
create
:group
}
let
(
:group
)
{
create
:group
}
let
(
:project
)
{
create
:
empty_
project
}
let
(
:project
)
{
create
:project
}
before
do
before
do
2
.
times
do
2
.
times
do
...
...
spec/workers/clear_shared_runners_minutes_worker_spec.rb
View file @
f81df0d4
...
@@ -12,7 +12,7 @@ describe ClearSharedRunnersMinutesWorker do
...
@@ -12,7 +12,7 @@ describe ClearSharedRunnersMinutesWorker do
subject
{
worker
.
perform
}
subject
{
worker
.
perform
}
context
'when project statistics are defined'
do
context
'when project statistics are defined'
do
let
(
:project
)
{
create
(
:
empty_
project
)
}
let
(
:project
)
{
create
(
:project
)
}
let
(
:statistics
)
{
project
.
statistics
}
let
(
:statistics
)
{
project
.
statistics
}
before
do
before
do
...
...
spec/workers/elastic_batch_project_indexer_worker_spec.rb
View file @
f81df0d4
...
@@ -2,7 +2,7 @@ require 'spec_helper'
...
@@ -2,7 +2,7 @@ require 'spec_helper'
describe
ElasticBatchProjectIndexerWorker
do
describe
ElasticBatchProjectIndexerWorker
do
subject
(
:worker
)
{
described_class
.
new
}
subject
(
:worker
)
{
described_class
.
new
}
let
(
:projects
)
{
create_list
(
:
empty_
project
,
2
)
}
let
(
:projects
)
{
create_list
(
:project
,
2
)
}
describe
'#perform'
do
describe
'#perform'
do
it
'runs the indexer for projects in the batch range'
do
it
'runs the indexer for projects in the batch range'
do
...
...
spec/workers/elastic_indexer_worker_spec.rb
View file @
f81df0d4
...
@@ -30,7 +30,7 @@ describe ElasticIndexerWorker, elastic: true do
...
@@ -30,7 +30,7 @@ describe ElasticIndexerWorker, elastic: true do
project
=
nil
project
=
nil
Sidekiq
::
Testing
.
disable!
do
Sidekiq
::
Testing
.
disable!
do
project
=
create
:
empty_
project
project
=
create
:project
end
end
expect
do
expect
do
...
@@ -97,7 +97,7 @@ describe ElasticIndexerWorker, elastic: true do
...
@@ -97,7 +97,7 @@ describe ElasticIndexerWorker, elastic: true do
project
=
nil
project
=
nil
Sidekiq
::
Testing
.
disable!
do
Sidekiq
::
Testing
.
disable!
do
project
=
create
:
empty_
project
project
=
create
:project
subject
.
perform
(
"index"
,
"Project"
,
project
.
id
)
subject
.
perform
(
"index"
,
"Project"
,
project
.
id
)
project
.
update
(
name:
"new"
)
project
.
update
(
name:
"new"
)
end
end
...
...
spec/workers/export_csv_worker_spec.rb
View file @
f81df0d4
...
@@ -2,7 +2,7 @@ require 'spec_helper'
...
@@ -2,7 +2,7 @@ require 'spec_helper'
describe
ExportCsvWorker
do
describe
ExportCsvWorker
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:project
)
{
create
(
:
empty_
project
,
creator:
user
)
}
let
(
:project
)
{
create
(
:project
,
creator:
user
)
}
def
perform
(
params
=
{})
def
perform
(
params
=
{})
described_class
.
new
.
perform
(
user
.
id
,
project
.
id
,
params
)
described_class
.
new
.
perform
(
user
.
id
,
project
.
id
,
params
)
...
...
spec/workers/geo/project_sync_worker_spec.rb
View file @
f81df0d4
...
@@ -2,7 +2,7 @@ require 'rails_helper'
...
@@ -2,7 +2,7 @@ require 'rails_helper'
RSpec
.
describe
Geo
::
ProjectSyncWorker
do
RSpec
.
describe
Geo
::
ProjectSyncWorker
do
describe
'#perform'
do
describe
'#perform'
do
let
(
:project
)
{
create
(
:
empty_
project
)
}
let
(
:project
)
{
create
(
:project
)
}
let
(
:repository_sync_service
)
{
spy
}
let
(
:repository_sync_service
)
{
spy
}
let
(
:wiki_sync_service
)
{
spy
}
let
(
:wiki_sync_service
)
{
spy
}
...
...
spec/workers/geo/repository_sync_worker_spec.rb
View file @
f81df0d4
...
@@ -3,8 +3,8 @@ require 'spec_helper'
...
@@ -3,8 +3,8 @@ require 'spec_helper'
describe
Geo
::
RepositorySyncWorker
do
describe
Geo
::
RepositorySyncWorker
do
let!
(
:primary
)
{
create
(
:geo_node
,
:primary
,
host:
'primary-geo-node'
)
}
let!
(
:primary
)
{
create
(
:geo_node
,
:primary
,
host:
'primary-geo-node'
)
}
let!
(
:secondary
)
{
create
(
:geo_node
,
:current
)
}
let!
(
:secondary
)
{
create
(
:geo_node
,
:current
)
}
let!
(
:project_1
)
{
create
(
:
empty_
project
)
}
let!
(
:project_1
)
{
create
(
:project
)
}
let!
(
:project_2
)
{
create
(
:
empty_
project
)
}
let!
(
:project_2
)
{
create
(
:project
)
}
subject
{
described_class
.
new
}
subject
{
described_class
.
new
}
...
...
spec/workers/geo_repository_fetch_worker_spec.rb
View file @
f81df0d4
...
@@ -2,7 +2,7 @@ require 'spec_helper'
...
@@ -2,7 +2,7 @@ require 'spec_helper'
describe
GeoRepositoryFetchWorker
do
describe
GeoRepositoryFetchWorker
do
describe
'#perform'
do
describe
'#perform'
do
let
(
:project
)
{
create
(
:
empty_
project
)
}
let
(
:project
)
{
create
(
:project
)
}
it
'delegates to Geo::RepositoryUpdateService'
do
it
'delegates to Geo::RepositoryUpdateService'
do
expect_any_instance_of
(
Geo
::
RepositoryUpdateService
).
to
receive
(
:execute
)
expect_any_instance_of
(
Geo
::
RepositoryUpdateService
).
to
receive
(
:execute
)
...
...
spec/workers/repository_import_worker_spec.rb
View file @
f81df0d4
...
@@ -19,7 +19,7 @@ describe RepositoryImportWorker do
...
@@ -19,7 +19,7 @@ describe RepositoryImportWorker do
end
end
context
'when project is a mirror'
do
context
'when project is a mirror'
do
let
(
:project
)
{
create
(
:
empty_
project
,
:mirror
,
:import_scheduled
)
}
let
(
:project
)
{
create
(
:project
,
:mirror
,
:import_scheduled
)
}
it
'adds mirror in front of the mirror scheduler queue'
do
it
'adds mirror in front of the mirror scheduler queue'
do
expect_any_instance_of
(
Projects
::
ImportService
).
to
receive
(
:execute
)
expect_any_instance_of
(
Projects
::
ImportService
).
to
receive
(
:execute
)
...
...
spec/workers/repository_update_mirror_worker_spec.rb
View file @
f81df0d4
...
@@ -5,7 +5,7 @@ describe RepositoryUpdateMirrorWorker do
...
@@ -5,7 +5,7 @@ describe RepositoryUpdateMirrorWorker do
describe
'#perform'
do
describe
'#perform'
do
context
'with status none'
do
context
'with status none'
do
let
(
:project
)
{
create
(
:
empty_
project
,
:mirror
,
:import_scheduled
)
}
let
(
:project
)
{
create
(
:project
,
:mirror
,
:import_scheduled
)
}
it
'sets status as finished when update mirror service executes successfully'
do
it
'sets status as finished when update mirror service executes successfully'
do
expect_any_instance_of
(
Projects
::
UpdateMirrorService
).
to
receive
(
:execute
).
and_return
(
status: :success
)
expect_any_instance_of
(
Projects
::
UpdateMirrorService
).
to
receive
(
:execute
).
and_return
(
status: :success
)
...
...
spec/workers/update_all_mirrors_worker_spec.rb
View file @
f81df0d4
...
@@ -15,7 +15,7 @@ describe UpdateAllMirrorsWorker do
...
@@ -15,7 +15,7 @@ describe UpdateAllMirrorsWorker do
end
end
it
'does not execute if cannot get the lease'
do
it
'does not execute if cannot get the lease'
do
create
(
:
empty_
project
,
:mirror
)
create
(
:project
,
:mirror
)
allow_any_instance_of
(
Gitlab
::
ExclusiveLease
).
to
receive
(
:try_obtain
).
and_return
(
false
)
allow_any_instance_of
(
Gitlab
::
ExclusiveLease
).
to
receive
(
:try_obtain
).
and_return
(
false
)
...
@@ -35,7 +35,7 @@ describe UpdateAllMirrorsWorker do
...
@@ -35,7 +35,7 @@ describe UpdateAllMirrorsWorker do
delegate
:fail_stuck_mirrors!
,
to: :worker
delegate
:fail_stuck_mirrors!
,
to: :worker
it
'ignores records that are not mirrors'
do
it
'ignores records that are not mirrors'
do
create
(
:
empty_
project
,
:import_started
,
mirror_last_update_at:
12
.
hours
.
ago
)
create
(
:project
,
:import_started
,
mirror_last_update_at:
12
.
hours
.
ago
)
expect_any_instance_of
(
Project
).
not_to
receive
(
:import_fail
)
expect_any_instance_of
(
Project
).
not_to
receive
(
:import_fail
)
...
@@ -43,7 +43,7 @@ describe UpdateAllMirrorsWorker do
...
@@ -43,7 +43,7 @@ describe UpdateAllMirrorsWorker do
end
end
it
'ignores records without in-progress import'
do
it
'ignores records without in-progress import'
do
create
(
:
empty_
project
,
:mirror
,
:import_finished
,
mirror_last_update_at:
12
.
hours
.
ago
)
create
(
:project
,
:mirror
,
:import_finished
,
mirror_last_update_at:
12
.
hours
.
ago
)
expect_any_instance_of
(
Project
).
not_to
receive
(
:import_fail
)
expect_any_instance_of
(
Project
).
not_to
receive
(
:import_fail
)
...
@@ -51,7 +51,7 @@ describe UpdateAllMirrorsWorker do
...
@@ -51,7 +51,7 @@ describe UpdateAllMirrorsWorker do
end
end
it
'ignores records with recently updated mirrors'
do
it
'ignores records with recently updated mirrors'
do
create
(
:
empty_
project
,
:mirror
,
mirror_last_update_at:
Time
.
now
)
create
(
:project
,
:mirror
,
mirror_last_update_at:
Time
.
now
)
expect_any_instance_of
(
Project
).
not_to
receive
(
:import_fail
)
expect_any_instance_of
(
Project
).
not_to
receive
(
:import_fail
)
...
@@ -59,7 +59,7 @@ describe UpdateAllMirrorsWorker do
...
@@ -59,7 +59,7 @@ describe UpdateAllMirrorsWorker do
end
end
it
'transitions stuck mirrors to a failed state and updates import_error message'
do
it
'transitions stuck mirrors to a failed state and updates import_error message'
do
project
=
create
(
:
empty_
project
,
:mirror
,
:import_started
)
project
=
create
(
:project
,
:mirror
,
:import_started
)
project
.
mirror_data
.
update_attributes
(
last_update_started_at:
25
.
minutes
.
ago
)
project
.
mirror_data
.
update_attributes
(
last_update_started_at:
25
.
minutes
.
ago
)
fail_stuck_mirrors!
fail_stuck_mirrors!
...
@@ -93,7 +93,7 @@ describe UpdateAllMirrorsWorker do
...
@@ -93,7 +93,7 @@ describe UpdateAllMirrorsWorker do
context
'unlicensed'
do
context
'unlicensed'
do
it
'does not schedule when project does not have repository mirrors available'
do
it
'does not schedule when project does not have repository mirrors available'
do
project
=
create
(
:
empty_
project
,
:mirror
)
project
=
create
(
:project
,
:mirror
)
stub_licensed_features
(
repository_mirrors:
false
)
stub_licensed_features
(
repository_mirrors:
false
)
...
@@ -106,7 +106,7 @@ describe UpdateAllMirrorsWorker do
...
@@ -106,7 +106,7 @@ describe UpdateAllMirrorsWorker do
context
'licensed'
do
context
'licensed'
do
def
scheduled_mirror
(
at
:,
licensed
:)
def
scheduled_mirror
(
at
:,
licensed
:)
namespace
=
create
(
:group
,
:public
,
plan:
(
Namespace
::
BRONZE_PLAN
if
licensed
))
namespace
=
create
(
:group
,
:public
,
plan:
(
Namespace
::
BRONZE_PLAN
if
licensed
))
project
=
create
(
:
empty_
project
,
:public
,
:mirror
,
namespace:
namespace
)
project
=
create
(
:project
,
:public
,
:mirror
,
namespace:
namespace
)
project
.
mirror_data
.
update!
(
next_execution_timestamp:
at
)
project
.
mirror_data
.
update!
(
next_execution_timestamp:
at
)
project
.
update!
(
visibility_level:
Gitlab
::
VisibilityLevel
::
PRIVATE
)
project
.
update!
(
visibility_level:
Gitlab
::
VisibilityLevel
::
PRIVATE
)
...
...
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