Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
GitLab
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
projects.thm.de
GitLab
Commits
27c95364
Commit
27c95364
authored
Dec 22, 2017
by
blackst0ne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace '.team << [user, role]' with 'add_role(user)' in specs
parent
36f47103
Changes
371
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
371 changed files
with
792 additions
and
799 deletions
+792
-799
app/models/project.rb
app/models/project.rb
+1
-1
app/models/project_team.rb
app/models/project_team.rb
+8
-20
changelogs/unreleased/36782-replace-team-user-role-with-add_role-user-in-specs.yml
...82-replace-team-user-role-with-add_role-user-in-specs.yml
+5
-0
db/fixtures/development/06_teams.rb
db/fixtures/development/06_teams.rb
+1
-1
features/steps/profile/profile.rb
features/steps/profile/profile.rb
+1
-1
features/steps/project/deploy_keys.rb
features/steps/project/deploy_keys.rb
+2
-2
features/steps/project/fork.rb
features/steps/project/fork.rb
+2
-2
features/steps/project/forked_merge_requests.rb
features/steps/project/forked_merge_requests.rb
+1
-1
features/steps/project/source/browse_files.rb
features/steps/project/source/browse_files.rb
+1
-1
features/steps/project/source/markdown_render.rb
features/steps/project/source/markdown_render.rb
+1
-1
features/steps/shared/group.rb
features/steps/shared/group.rb
+1
-1
features/steps/shared/project.rb
features/steps/shared/project.rb
+10
-11
spec/controllers/admin/users_controller_spec.rb
spec/controllers/admin/users_controller_spec.rb
+1
-1
spec/controllers/boards/issues_controller_spec.rb
spec/controllers/boards/issues_controller_spec.rb
+3
-3
spec/controllers/boards/lists_controller_spec.rb
spec/controllers/boards/lists_controller_spec.rb
+2
-2
spec/controllers/dashboard/milestones_controller_spec.rb
spec/controllers/dashboard/milestones_controller_spec.rb
+1
-1
spec/controllers/dashboard/todos_controller_spec.rb
spec/controllers/dashboard/todos_controller_spec.rb
+1
-1
spec/controllers/dashboard_controller_spec.rb
spec/controllers/dashboard_controller_spec.rb
+1
-1
spec/controllers/groups/milestones_controller_spec.rb
spec/controllers/groups/milestones_controller_spec.rb
+1
-1
spec/controllers/notification_settings_controller_spec.rb
spec/controllers/notification_settings_controller_spec.rb
+1
-1
spec/controllers/projects/avatars_controller_spec.rb
spec/controllers/projects/avatars_controller_spec.rb
+1
-1
spec/controllers/projects/blame_controller_spec.rb
spec/controllers/projects/blame_controller_spec.rb
+1
-1
spec/controllers/projects/blob_controller_spec.rb
spec/controllers/projects/blob_controller_spec.rb
+4
-4
spec/controllers/projects/boards_controller_spec.rb
spec/controllers/projects/boards_controller_spec.rb
+1
-1
spec/controllers/projects/branches_controller_spec.rb
spec/controllers/projects/branches_controller_spec.rb
+2
-2
spec/controllers/projects/commits_controller_spec.rb
spec/controllers/projects/commits_controller_spec.rb
+1
-1
spec/controllers/projects/compare_controller_spec.rb
spec/controllers/projects/compare_controller_spec.rb
+1
-1
spec/controllers/projects/cycle_analytics_controller_spec.rb
spec/controllers/projects/cycle_analytics_controller_spec.rb
+1
-1
spec/controllers/projects/deploy_keys_controller_spec.rb
spec/controllers/projects/deploy_keys_controller_spec.rb
+2
-2
spec/controllers/projects/deployments_controller_spec.rb
spec/controllers/projects/deployments_controller_spec.rb
+1
-1
spec/controllers/projects/discussions_controller_spec.rb
spec/controllers/projects/discussions_controller_spec.rb
+2
-2
spec/controllers/projects/find_file_controller_spec.rb
spec/controllers/projects/find_file_controller_spec.rb
+1
-1
spec/controllers/projects/forks_controller_spec.rb
spec/controllers/projects/forks_controller_spec.rb
+1
-1
spec/controllers/projects/graphs_controller_spec.rb
spec/controllers/projects/graphs_controller_spec.rb
+1
-1
spec/controllers/projects/group_links_controller_spec.rb
spec/controllers/projects/group_links_controller_spec.rb
+1
-1
spec/controllers/projects/hooks_controller_spec.rb
spec/controllers/projects/hooks_controller_spec.rb
+1
-1
spec/controllers/projects/imports_controller_spec.rb
spec/controllers/projects/imports_controller_spec.rb
+2
-2
spec/controllers/projects/issues_controller_spec.rb
spec/controllers/projects/issues_controller_spec.rb
+14
-14
spec/controllers/projects/jobs_controller_spec.rb
spec/controllers/projects/jobs_controller_spec.rb
+1
-1
spec/controllers/projects/labels_controller_spec.rb
spec/controllers/projects/labels_controller_spec.rb
+1
-1
spec/controllers/projects/mattermosts_controller_spec.rb
spec/controllers/projects/mattermosts_controller_spec.rb
+1
-1
spec/controllers/projects/merge_requests/creations_controller_spec.rb
...lers/projects/merge_requests/creations_controller_spec.rb
+2
-2
spec/controllers/projects/merge_requests/diffs_controller_spec.rb
...trollers/projects/merge_requests/diffs_controller_spec.rb
+1
-1
spec/controllers/projects/milestones_controller_spec.rb
spec/controllers/projects/milestones_controller_spec.rb
+1
-1
spec/controllers/projects/notes_controller_spec.rb
spec/controllers/projects/notes_controller_spec.rb
+7
-7
spec/controllers/projects/project_members_controller_spec.rb
spec/controllers/projects/project_members_controller_spec.rb
+13
-13
spec/controllers/projects/refs_controller_spec.rb
spec/controllers/projects/refs_controller_spec.rb
+1
-1
spec/controllers/projects/releases_controller_spec.rb
spec/controllers/projects/releases_controller_spec.rb
+1
-1
spec/controllers/projects/repositories_controller_spec.rb
spec/controllers/projects/repositories_controller_spec.rb
+1
-1
spec/controllers/projects/services_controller_spec.rb
spec/controllers/projects/services_controller_spec.rb
+1
-1
spec/controllers/projects/settings/ci_cd_controller_spec.rb
spec/controllers/projects/settings/ci_cd_controller_spec.rb
+1
-1
spec/controllers/projects/settings/integrations_controller_spec.rb
...rollers/projects/settings/integrations_controller_spec.rb
+1
-1
spec/controllers/projects/templates_controller_spec.rb
spec/controllers/projects/templates_controller_spec.rb
+1
-1
spec/controllers/projects/todos_controller_spec.rb
spec/controllers/projects/todos_controller_spec.rb
+2
-2
spec/controllers/projects/tree_controller_spec.rb
spec/controllers/projects/tree_controller_spec.rb
+1
-1
spec/controllers/projects/variables_controller_spec.rb
spec/controllers/projects/variables_controller_spec.rb
+1
-1
spec/controllers/projects_controller_spec.rb
spec/controllers/projects_controller_spec.rb
+3
-3
spec/controllers/uploads_controller_spec.rb
spec/controllers/uploads_controller_spec.rb
+4
-4
spec/controllers/users_controller_spec.rb
spec/controllers/users_controller_spec.rb
+2
-2
spec/features/admin/admin_projects_spec.rb
spec/features/admin/admin_projects_spec.rb
+3
-3
spec/features/atom/dashboard_issues_spec.rb
spec/features/atom/dashboard_issues_spec.rb
+2
-2
spec/features/atom/dashboard_spec.rb
spec/features/atom/dashboard_spec.rb
+1
-1
spec/features/atom/issues_spec.rb
spec/features/atom/issues_spec.rb
+1
-1
spec/features/atom/users_spec.rb
spec/features/atom/users_spec.rb
+1
-1
spec/features/auto_deploy_spec.rb
spec/features/auto_deploy_spec.rb
+2
-2
spec/features/boards/add_issues_modal_spec.rb
spec/features/boards/add_issues_modal_spec.rb
+1
-1
spec/features/boards/boards_spec.rb
spec/features/boards/boards_spec.rb
+3
-3
spec/features/boards/issue_ordering_spec.rb
spec/features/boards/issue_ordering_spec.rb
+1
-1
spec/features/boards/modal_filter_spec.rb
spec/features/boards/modal_filter_spec.rb
+3
-3
spec/features/boards/new_issue_spec.rb
spec/features/boards/new_issue_spec.rb
+1
-1
spec/features/commits_spec.rb
spec/features/commits_spec.rb
+4
-4
spec/features/cycle_analytics_spec.rb
spec/features/cycle_analytics_spec.rb
+1
-1
spec/features/dashboard/archived_projects_spec.rb
spec/features/dashboard/archived_projects_spec.rb
+2
-2
spec/features/dashboard/datetime_on_tooltips_spec.rb
spec/features/dashboard/datetime_on_tooltips_spec.rb
+2
-2
spec/features/dashboard/issues_spec.rb
spec/features/dashboard/issues_spec.rb
+1
-1
spec/features/dashboard/milestones_spec.rb
spec/features/dashboard/milestones_spec.rb
+1
-1
spec/features/dashboard/project_member_activity_index_spec.rb
.../features/dashboard/project_member_activity_index_spec.rb
+1
-1
spec/features/dashboard/projects_spec.rb
spec/features/dashboard/projects_spec.rb
+1
-1
spec/features/dashboard/todos/todos_filtering_spec.rb
spec/features/dashboard/todos/todos_filtering_spec.rb
+4
-4
spec/features/dashboard/todos/todos_sorting_spec.rb
spec/features/dashboard/todos/todos_sorting_spec.rb
+1
-1
spec/features/dashboard/user_filters_projects_spec.rb
spec/features/dashboard/user_filters_projects_spec.rb
+2
-2
spec/features/global_search_spec.rb
spec/features/global_search_spec.rb
+1
-1
spec/features/issues/award_emoji_spec.rb
spec/features/issues/award_emoji_spec.rb
+1
-1
spec/features/issues/bulk_assignment_labels_spec.rb
spec/features/issues/bulk_assignment_labels_spec.rb
+1
-1
spec/features/issues/create_issue_for_discussions_in_merge_request_spec.rb
...ues/create_issue_for_discussions_in_merge_request_spec.rb
+2
-2
spec/features/issues/create_issue_for_single_discussion_in_merge_request_spec.rb
...eate_issue_for_single_discussion_in_merge_request_spec.rb
+2
-2
spec/features/issues/filtered_search/dropdown_assignee_spec.rb
...features/issues/filtered_search/dropdown_assignee_spec.rb
+4
-4
spec/features/issues/filtered_search/dropdown_author_spec.rb
spec/features/issues/filtered_search/dropdown_author_spec.rb
+4
-4
spec/features/issues/filtered_search/dropdown_emoji_spec.rb
spec/features/issues/filtered_search/dropdown_emoji_spec.rb
+1
-1
spec/features/issues/filtered_search/dropdown_hint_spec.rb
spec/features/issues/filtered_search/dropdown_hint_spec.rb
+1
-1
spec/features/issues/filtered_search/dropdown_milestone_spec.rb
...eatures/issues/filtered_search/dropdown_milestone_spec.rb
+1
-1
spec/features/issues/filtered_search/search_bar_spec.rb
spec/features/issues/filtered_search/search_bar_spec.rb
+1
-1
spec/features/issues/form_spec.rb
spec/features/issues/form_spec.rb
+2
-2
spec/features/issues/gfm_autocomplete_spec.rb
spec/features/issues/gfm_autocomplete_spec.rb
+1
-1
spec/features/issues/issue_sidebar_spec.rb
spec/features/issues/issue_sidebar_spec.rb
+3
-3
spec/features/issues/move_spec.rb
spec/features/issues/move_spec.rb
+5
-5
spec/features/issues/notes_on_issues_spec.rb
spec/features/issues/notes_on_issues_spec.rb
+1
-1
spec/features/issues/spam_issues_spec.rb
spec/features/issues/spam_issues_spec.rb
+1
-1
spec/features/issues/todo_spec.rb
spec/features/issues/todo_spec.rb
+1
-1
spec/features/issues/update_issues_spec.rb
spec/features/issues/update_issues_spec.rb
+1
-1
spec/features/issues/user_uses_slash_commands_spec.rb
spec/features/issues/user_uses_slash_commands_spec.rb
+6
-6
spec/features/issues_spec.rb
spec/features/issues_spec.rb
+5
-4
spec/features/merge_requests/assign_issues_spec.rb
spec/features/merge_requests/assign_issues_spec.rb
+1
-1
spec/features/merge_requests/check_if_mergeable_with_unresolved_discussions_spec.rb
...ts/check_if_mergeable_with_unresolved_discussions_spec.rb
+1
-1
spec/features/merge_requests/cherry_pick_spec.rb
spec/features/merge_requests/cherry_pick_spec.rb
+1
-1
spec/features/merge_requests/closes_issues_spec.rb
spec/features/merge_requests/closes_issues_spec.rb
+1
-1
spec/features/merge_requests/conflicts_spec.rb
spec/features/merge_requests/conflicts_spec.rb
+2
-2
spec/features/merge_requests/create_new_mr_spec.rb
spec/features/merge_requests/create_new_mr_spec.rb
+1
-1
spec/features/merge_requests/created_from_fork_spec.rb
spec/features/merge_requests/created_from_fork_spec.rb
+1
-1
spec/features/merge_requests/deleted_source_branch_spec.rb
spec/features/merge_requests/deleted_source_branch_spec.rb
+1
-1
spec/features/merge_requests/diff_notes_avatars_spec.rb
spec/features/merge_requests/diff_notes_avatars_spec.rb
+1
-1
spec/features/merge_requests/diff_notes_resolve_spec.rb
spec/features/merge_requests/diff_notes_resolve_spec.rb
+3
-3
spec/features/merge_requests/edit_mr_spec.rb
spec/features/merge_requests/edit_mr_spec.rb
+1
-1
spec/features/merge_requests/filter_by_milestone_spec.rb
spec/features/merge_requests/filter_by_milestone_spec.rb
+1
-1
spec/features/merge_requests/form_spec.rb
spec/features/merge_requests/form_spec.rb
+3
-3
spec/features/merge_requests/image_diff_notes_spec.rb
spec/features/merge_requests/image_diff_notes_spec.rb
+1
-1
spec/features/merge_requests/merge_commit_message_toggle_spec.rb
...atures/merge_requests/merge_commit_message_toggle_spec.rb
+1
-1
spec/features/merge_requests/merge_immediately_with_pipeline_spec.rb
...es/merge_requests/merge_immediately_with_pipeline_spec.rb
+1
-1
spec/features/merge_requests/only_allow_merge_if_build_succeeds_spec.rb
...merge_requests/only_allow_merge_if_build_succeeds_spec.rb
+1
-1
spec/features/merge_requests/pipelines_spec.rb
spec/features/merge_requests/pipelines_spec.rb
+1
-1
spec/features/merge_requests/reset_filters_spec.rb
spec/features/merge_requests/reset_filters_spec.rb
+1
-1
spec/features/merge_requests/target_branch_spec.rb
spec/features/merge_requests/target_branch_spec.rb
+1
-1
spec/features/merge_requests/update_merge_requests_spec.rb
spec/features/merge_requests/update_merge_requests_spec.rb
+1
-1
spec/features/merge_requests/user_uses_slash_commands_spec.rb
.../features/merge_requests/user_uses_slash_commands_spec.rb
+5
-5
spec/features/merge_requests/widget_deployments_spec.rb
spec/features/merge_requests/widget_deployments_spec.rb
+1
-1
spec/features/merge_requests/widget_spec.rb
spec/features/merge_requests/widget_spec.rb
+1
-1
spec/features/merge_requests/wip_message_spec.rb
spec/features/merge_requests/wip_message_spec.rb
+1
-1
spec/features/milestone_spec.rb
spec/features/milestone_spec.rb
+1
-1
spec/features/profiles/user_visits_notifications_tab_spec.rb
spec/features/profiles/user_visits_notifications_tab_spec.rb
+1
-1
spec/features/projects/activity/rss_spec.rb
spec/features/projects/activity/rss_spec.rb
+1
-1
spec/features/projects/badges/coverage_spec.rb
spec/features/projects/badges/coverage_spec.rb
+1
-1
spec/features/projects/badges/list_spec.rb
spec/features/projects/badges/list_spec.rb
+1
-1
spec/features/projects/blobs/edit_spec.rb
spec/features/projects/blobs/edit_spec.rb
+4
-4
spec/features/projects/branches/download_buttons_spec.rb
spec/features/projects/branches/download_buttons_spec.rb
+1
-1
spec/features/projects/branches_spec.rb
spec/features/projects/branches_spec.rb
+2
-2
spec/features/projects/commit/builds_spec.rb
spec/features/projects/commit/builds_spec.rb
+1
-1
spec/features/projects/commit/cherry_pick_spec.rb
spec/features/projects/commit/cherry_pick_spec.rb
+1
-1
spec/features/projects/commits/rss_spec.rb
spec/features/projects/commits/rss_spec.rb
+1
-1
spec/features/projects/compare_spec.rb
spec/features/projects/compare_spec.rb
+1
-1
spec/features/projects/deploy_keys_spec.rb
spec/features/projects/deploy_keys_spec.rb
+1
-1
spec/features/projects/developer_views_empty_project_instructions_spec.rb
...ojects/developer_views_empty_project_instructions_spec.rb
+1
-1
spec/features/projects/edit_spec.rb
spec/features/projects/edit_spec.rb
+1
-1
spec/features/projects/environments/environment_spec.rb
spec/features/projects/environments/environment_spec.rb
+1
-1
spec/features/projects/environments/environments_spec.rb
spec/features/projects/environments/environments_spec.rb
+1
-1
spec/features/projects/features_visibility_spec.rb
spec/features/projects/features_visibility_spec.rb
+3
-3
spec/features/projects/files/browse_files_spec.rb
spec/features/projects/files/browse_files_spec.rb
+1
-1
spec/features/projects/files/creating_a_file_spec.rb
spec/features/projects/files/creating_a_file_spec.rb
+1
-1
spec/features/projects/files/dockerfile_dropdown_spec.rb
spec/features/projects/files/dockerfile_dropdown_spec.rb
+1
-1
spec/features/projects/files/download_buttons_spec.rb
spec/features/projects/files/download_buttons_spec.rb
+1
-1
spec/features/projects/files/edit_file_soft_wrap_spec.rb
spec/features/projects/files/edit_file_soft_wrap_spec.rb
+1
-1
spec/features/projects/files/editing_a_file_spec.rb
spec/features/projects/files/editing_a_file_spec.rb
+1
-1
spec/features/projects/files/files_sort_submodules_with_folders_spec.rb
...projects/files/files_sort_submodules_with_folders_spec.rb
+1
-1
spec/features/projects/files/find_file_keyboard_spec.rb
spec/features/projects/files/find_file_keyboard_spec.rb
+1
-1
spec/features/projects/files/gitignore_dropdown_spec.rb
spec/features/projects/files/gitignore_dropdown_spec.rb
+1
-1
spec/features/projects/files/gitlab_ci_yml_dropdown_spec.rb
spec/features/projects/files/gitlab_ci_yml_dropdown_spec.rb
+1
-1
spec/features/projects/files/project_owner_creates_license_file_spec.rb
...projects/files/project_owner_creates_license_file_spec.rb
+1
-1
spec/features/projects/files/template_type_dropdown_spec.rb
spec/features/projects/files/template_type_dropdown_spec.rb
+1
-1
spec/features/projects/files/undo_template_spec.rb
spec/features/projects/files/undo_template_spec.rb
+1
-1
spec/features/projects/guest_navigation_menu_spec.rb
spec/features/projects/guest_navigation_menu_spec.rb
+1
-1
spec/features/projects/issuable_templates_spec.rb
spec/features/projects/issuable_templates_spec.rb
+2
-2
spec/features/projects/issues/rss_spec.rb
spec/features/projects/issues/rss_spec.rb
+1
-1
spec/features/projects/jobs_spec.rb
spec/features/projects/jobs_spec.rb
+1
-1
spec/features/projects/labels/subscription_spec.rb
spec/features/projects/labels/subscription_spec.rb
+1
-1
spec/features/projects/labels/update_prioritization_spec.rb
spec/features/projects/labels/update_prioritization_spec.rb
+1
-1
spec/features/projects/main/download_buttons_spec.rb
spec/features/projects/main/download_buttons_spec.rb
+1
-1
spec/features/projects/main/rss_spec.rb
spec/features/projects/main/rss_spec.rb
+1
-1
spec/features/projects/members/anonymous_user_sees_members_spec.rb
...ures/projects/members/anonymous_user_sees_members_spec.rb
+1
-1
spec/features/projects/members/group_members_spec.rb
spec/features/projects/members/group_members_spec.rb
+1
-1
spec/features/projects/members/groups_with_access_list_spec.rb
...features/projects/members/groups_with_access_list_spec.rb
+1
-1
spec/features/projects/members/master_adds_member_with_expiration_date_spec.rb
...s/members/master_adds_member_with_expiration_date_spec.rb
+1
-1
spec/features/projects/members/master_manages_access_requests_spec.rb
...s/projects/members/master_manages_access_requests_spec.rb
+1
-1
spec/features/projects/members/member_cannot_request_access_to_his_project_spec.rb
...mbers/member_cannot_request_access_to_his_project_spec.rb
+1
-1
spec/features/projects/members/member_leaves_project_spec.rb
spec/features/projects/members/member_leaves_project_spec.rb
+1
-1
spec/features/projects/merge_requests/list_spec.rb
spec/features/projects/merge_requests/list_spec.rb
+1
-1
spec/features/projects/pages_spec.rb
spec/features/projects/pages_spec.rb
+1
-1
spec/features/projects/pipelines/pipeline_spec.rb
spec/features/projects/pipelines/pipeline_spec.rb
+1
-1
spec/features/projects/pipelines/pipelines_spec.rb
spec/features/projects/pipelines/pipelines_spec.rb
+1
-1
spec/features/projects/services/user_activates_jira_spec.rb
spec/features/projects/services/user_activates_jira_spec.rb
+1
-1
spec/features/projects/services/user_activates_mattermost_slash_command_spec.rb
.../services/user_activates_mattermost_slash_command_spec.rb
+1
-1
spec/features/projects/services/user_activates_slack_slash_command_spec.rb
...jects/services/user_activates_slack_slash_command_spec.rb
+1
-1
spec/features/projects/settings/integration_settings_spec.rb
spec/features/projects/settings/integration_settings_spec.rb
+1
-1
spec/features/projects/settings/merge_requests_settings_spec.rb
...eatures/projects/settings/merge_requests_settings_spec.rb
+1
-1
spec/features/projects/settings/pipelines_settings_spec.rb
spec/features/projects/settings/pipelines_settings_spec.rb
+1
-1
spec/features/projects/settings/repository_settings_spec.rb
spec/features/projects/settings/repository_settings_spec.rb
+2
-2
spec/features/projects/settings/visibility_settings_spec.rb
spec/features/projects/settings/visibility_settings_spec.rb
+1
-1
spec/features/projects/snippets/create_snippet_spec.rb
spec/features/projects/snippets/create_snippet_spec.rb
+1
-1
spec/features/projects/snippets/show_spec.rb
spec/features/projects/snippets/show_spec.rb
+1
-1
spec/features/projects/tags/download_buttons_spec.rb
spec/features/projects/tags/download_buttons_spec.rb
+1
-1
spec/features/projects/tree/rss_spec.rb
spec/features/projects/tree/rss_spec.rb
+1
-1
spec/features/projects/user_browses_files_spec.rb
spec/features/projects/user_browses_files_spec.rb
+1
-1
spec/features/projects/user_creates_directory_spec.rb
spec/features/projects/user_creates_directory_spec.rb
+2
-2
spec/features/projects/user_creates_files_spec.rb
spec/features/projects/user_creates_files_spec.rb
+3
-3
spec/features/projects/user_deletes_files_spec.rb
spec/features/projects/user_deletes_files_spec.rb
+2
-2
spec/features/projects/user_edits_files_spec.rb
spec/features/projects/user_edits_files_spec.rb
+2
-2
spec/features/projects/user_replaces_files_spec.rb
spec/features/projects/user_replaces_files_spec.rb
+2
-2
spec/features/projects/user_uploads_files_spec.rb
spec/features/projects/user_uploads_files_spec.rb
+2
-2
spec/features/projects/wiki/markdown_preview_spec.rb
spec/features/projects/wiki/markdown_preview_spec.rb
+1
-1
spec/features/projects/wiki/user_views_wiki_in_project_page_spec.rb
...res/projects/wiki/user_views_wiki_in_project_page_spec.rb
+1
-1
spec/features/projects_spec.rb
spec/features/projects_spec.rb
+3
-3
spec/features/signed_commits_spec.rb
spec/features/signed_commits_spec.rb
+3
-3
spec/features/tags/master_creates_tag_spec.rb
spec/features/tags/master_creates_tag_spec.rb
+1
-1
spec/features/tags/master_deletes_tag_spec.rb
spec/features/tags/master_deletes_tag_spec.rb
+1
-1
spec/features/tags/master_updates_tag_spec.rb
spec/features/tags/master_updates_tag_spec.rb
+1
-1
spec/features/triggers_spec.rb
spec/features/triggers_spec.rb
+3
-3
spec/features/variables_spec.rb
spec/features/variables_spec.rb
+1
-1
spec/finders/access_requests_finder_spec.rb
spec/finders/access_requests_finder_spec.rb
+2
-2
spec/finders/group_projects_finder_spec.rb
spec/finders/group_projects_finder_spec.rb
+2
-2
spec/finders/issues_finder_spec.rb
spec/finders/issues_finder_spec.rb
+3
-3
spec/finders/labels_finder_spec.rb
spec/finders/labels_finder_spec.rb
+2
-2
spec/finders/merge_requests_finder_spec.rb
spec/finders/merge_requests_finder_spec.rb
+4
-4
spec/finders/move_to_project_finder_spec.rb
spec/finders/move_to_project_finder_spec.rb
+17
-17
spec/finders/notes_finder_spec.rb
spec/finders/notes_finder_spec.rb
+3
-3
spec/finders/personal_projects_finder_spec.rb
spec/finders/personal_projects_finder_spec.rb
+1
-1
spec/finders/snippets_finder_spec.rb
spec/finders/snippets_finder_spec.rb
+2
-2
spec/finders/todos_finder_spec.rb
spec/finders/todos_finder_spec.rb
+1
-1
spec/helpers/markup_helper_spec.rb
spec/helpers/markup_helper_spec.rb
+1
-1
spec/helpers/notes_helper_spec.rb
spec/helpers/notes_helper_spec.rb
+4
-4
spec/lib/banzai/filter/redactor_filter_spec.rb
spec/lib/banzai/filter/redactor_filter_spec.rb
+3
-3
spec/lib/banzai/filter/user_reference_filter_spec.rb
spec/lib/banzai/filter/user_reference_filter_spec.rb
+3
-3
spec/lib/banzai/reference_parser/user_parser_spec.rb
spec/lib/banzai/reference_parser/user_parser_spec.rb
+3
-3
spec/lib/gitlab/ci/status/build/common_spec.rb
spec/lib/gitlab/ci/status/build/common_spec.rb
+1
-1
spec/lib/gitlab/ci/status/external/common_spec.rb
spec/lib/gitlab/ci/status/external/common_spec.rb
+1
-1
spec/lib/gitlab/ci/status/external/factory_spec.rb
spec/lib/gitlab/ci/status/external/factory_spec.rb
+1
-1
spec/lib/gitlab/ci/status/pipeline/common_spec.rb
spec/lib/gitlab/ci/status/pipeline/common_spec.rb
+1
-1
spec/lib/gitlab/ci/status/pipeline/factory_spec.rb
spec/lib/gitlab/ci/status/pipeline/factory_spec.rb
+1
-1
spec/lib/gitlab/ci/status/stage/common_spec.rb
spec/lib/gitlab/ci/status/stage/common_spec.rb
+1
-1
spec/lib/gitlab/ci/status/stage/factory_spec.rb
spec/lib/gitlab/ci/status/stage/factory_spec.rb
+1
-1
spec/lib/gitlab/closing_issue_extractor_spec.rb
spec/lib/gitlab/closing_issue_extractor_spec.rb
+3
-3
spec/lib/gitlab/cycle_analytics/permissions_spec.rb
spec/lib/gitlab/cycle_analytics/permissions_spec.rb
+4
-4
spec/lib/gitlab/email/handler/create_note_handler_spec.rb
spec/lib/gitlab/email/handler/create_note_handler_spec.rb
+2
-2
spec/lib/gitlab/gfm/reference_rewriter_spec.rb
spec/lib/gitlab/gfm/reference_rewriter_spec.rb
+1
-1
spec/lib/gitlab/git/repository_spec.rb
spec/lib/gitlab/git/repository_spec.rb
+1
-1
spec/lib/gitlab/git_access_spec.rb
spec/lib/gitlab/git_access_spec.rb
+5
-5
spec/lib/gitlab/git_access_wiki_spec.rb
spec/lib/gitlab/git_access_wiki_spec.rb
+2
-2
spec/lib/gitlab/google_code_import/importer_spec.rb
spec/lib/gitlab/google_code_import/importer_spec.rb
+1
-1
spec/lib/gitlab/import_export/project_tree_saver_spec.rb
spec/lib/gitlab/import_export/project_tree_saver_spec.rb
+1
-1
spec/lib/gitlab/import_export/repo_saver_spec.rb
spec/lib/gitlab/import_export/repo_saver_spec.rb
+1
-1
spec/lib/gitlab/import_export/wiki_repo_saver_spec.rb
spec/lib/gitlab/import_export/wiki_repo_saver_spec.rb
+1
-1
spec/lib/gitlab/project_authorizations_spec.rb
spec/lib/gitlab/project_authorizations_spec.rb
+1
-1
spec/lib/gitlab/project_search_results_spec.rb
spec/lib/gitlab/project_search_results_spec.rb
+4
-4
spec/lib/gitlab/reference_extractor_spec.rb
spec/lib/gitlab/reference_extractor_spec.rb
+7
-7
spec/lib/gitlab/search_results_spec.rb
spec/lib/gitlab/search_results_spec.rb
+5
-5
spec/lib/gitlab/slash_commands/issue_new_spec.rb
spec/lib/gitlab/slash_commands/issue_new_spec.rb
+1
-1
spec/lib/gitlab/slash_commands/issue_search_spec.rb
spec/lib/gitlab/slash_commands/issue_search_spec.rb
+1
-1
spec/lib/gitlab/slash_commands/issue_show_spec.rb
spec/lib/gitlab/slash_commands/issue_show_spec.rb
+1
-1
spec/lib/gitlab/user_access_spec.rb
spec/lib/gitlab/user_access_spec.rb
+18
-18
spec/mailers/notify_spec.rb
spec/mailers/notify_spec.rb
+4
-4
spec/models/ability_spec.rb
spec/models/ability_spec.rb
+3
-3
spec/models/ci/pipeline_spec.rb
spec/models/ci/pipeline_spec.rb
+1
-1
spec/models/ci/trigger_spec.rb
spec/models/ci/trigger_spec.rb
+1
-1
spec/models/commit_spec.rb
spec/models/commit_spec.rb
+2
-2
spec/models/concerns/mentionable_spec.rb
spec/models/concerns/mentionable_spec.rb
+2
-2
spec/models/concerns/milestoneish_spec.rb
spec/models/concerns/milestoneish_spec.rb
+2
-2
spec/models/concerns/resolvable_discussion_spec.rb
spec/models/concerns/resolvable_discussion_spec.rb
+1
-1
spec/models/event_spec.rb
spec/models/event_spec.rb
+2
-2
spec/models/generic_commit_status_spec.rb
spec/models/generic_commit_status_spec.rb
+1
-1
spec/models/hooks/system_hook_spec.rb
spec/models/hooks/system_hook_spec.rb
+2
-2
spec/models/issue_collection_spec.rb
spec/models/issue_collection_spec.rb
+1
-1
spec/models/issue_spec.rb
spec/models/issue_spec.rb
+7
-7
spec/models/member_spec.rb
spec/models/member_spec.rb
+4
-4
spec/models/members/project_member_spec.rb
spec/models/members/project_member_spec.rb
+4
-4
spec/models/merge_request_spec.rb
spec/models/merge_request_spec.rb
+6
-6
spec/models/note_spec.rb
spec/models/note_spec.rb
+1
-1
spec/models/project_feature_spec.rb
spec/models/project_feature_spec.rb
+1
-1
spec/models/project_services/pipelines_email_service_spec.rb
spec/models/project_services/pipelines_email_service_spec.rb
+1
-1
spec/models/project_spec.rb
spec/models/project_spec.rb
+7
-7
spec/models/project_team_spec.rb
spec/models/project_team_spec.rb
+2
-2
spec/models/user_spec.rb
spec/models/user_spec.rb
+13
-13
spec/policies/ci/build_policy_spec.rb
spec/policies/ci/build_policy_spec.rb
+2
-2
spec/policies/ci/trigger_policy_spec.rb
spec/policies/ci/trigger_policy_spec.rb
+5
-5
spec/policies/issue_policy_spec.rb
spec/policies/issue_policy_spec.rb
+6
-6
spec/policies/project_snippet_policy_spec.rb
spec/policies/project_snippet_policy_spec.rb
+3
-3
spec/presenters/merge_request_presenter_spec.rb
spec/presenters/merge_request_presenter_spec.rb
+4
-4
spec/requests/api/access_requests_spec.rb
spec/requests/api/access_requests_spec.rb
+2
-2
spec/requests/api/award_emoji_spec.rb
spec/requests/api/award_emoji_spec.rb
+1
-1
spec/requests/api/boards_spec.rb
spec/requests/api/boards_spec.rb
+2
-2
spec/requests/api/deployments_spec.rb
spec/requests/api/deployments_spec.rb
+1
-1
spec/requests/api/environments_spec.rb
spec/requests/api/environments_spec.rb
+1
-1
spec/requests/api/files_spec.rb
spec/requests/api/files_spec.rb
+1
-1
spec/requests/api/groups_spec.rb
spec/requests/api/groups_spec.rb
+1
-1
spec/requests/api/internal_spec.rb
spec/requests/api/internal_spec.rb
+8
-8
spec/requests/api/issues_spec.rb
spec/requests/api/issues_spec.rb
+4
-4
spec/requests/api/jobs_spec.rb
spec/requests/api/jobs_spec.rb
+1
-1
spec/requests/api/labels_spec.rb
spec/requests/api/labels_spec.rb
+1
-1
spec/requests/api/members_spec.rb
spec/requests/api/members_spec.rb
+2
-2
spec/requests/api/merge_request_diffs_spec.rb
spec/requests/api/merge_request_diffs_spec.rb
+1
-1
spec/requests/api/merge_requests_spec.rb
spec/requests/api/merge_requests_spec.rb
+6
-6
spec/requests/api/notes_spec.rb
spec/requests/api/notes_spec.rb
+2
-2
spec/requests/api/pipelines_spec.rb
spec/requests/api/pipelines_spec.rb
+2
-2
spec/requests/api/project_hooks_spec.rb
spec/requests/api/project_hooks_spec.rb
+3
-3
spec/requests/api/project_milestones_spec.rb
spec/requests/api/project_milestones_spec.rb
+1
-1
spec/requests/api/projects_spec.rb
spec/requests/api/projects_spec.rb
+5
-5
spec/requests/api/services_spec.rb
spec/requests/api/services_spec.rb
+1
-1
spec/requests/api/todos_spec.rb
spec/requests/api/todos_spec.rb
+3
-3
spec/requests/api/v3/award_emoji_spec.rb
spec/requests/api/v3/award_emoji_spec.rb
+1
-1
spec/requests/api/v3/boards_spec.rb
spec/requests/api/v3/boards_spec.rb
+2
-2
spec/requests/api/v3/commits_spec.rb
spec/requests/api/v3/commits_spec.rb
+4
-4
spec/requests/api/v3/deployments_spec.rb
spec/requests/api/v3/deployments_spec.rb
+1
-1
spec/requests/api/v3/environments_spec.rb
spec/requests/api/v3/environments_spec.rb
+1
-1
spec/requests/api/v3/files_spec.rb
spec/requests/api/v3/files_spec.rb
+1
-1
spec/requests/api/v3/groups_spec.rb
spec/requests/api/v3/groups_spec.rb
+1
-1
spec/requests/api/v3/issues_spec.rb
spec/requests/api/v3/issues_spec.rb
+4
-4
spec/requests/api/v3/labels_spec.rb
spec/requests/api/v3/labels_spec.rb
+1
-1
spec/requests/api/v3/members_spec.rb
spec/requests/api/v3/members_spec.rb
+2
-2
spec/requests/api/v3/merge_request_diffs_spec.rb
spec/requests/api/v3/merge_request_diffs_spec.rb
+1
-1
spec/requests/api/v3/merge_requests_spec.rb
spec/requests/api/v3/merge_requests_spec.rb
+6
-6
spec/requests/api/v3/milestones_spec.rb
spec/requests/api/v3/milestones_spec.rb
+3
-3
spec/requests/api/v3/notes_spec.rb
spec/requests/api/v3/notes_spec.rb
+2
-2
spec/requests/api/v3/pipelines_spec.rb
spec/requests/api/v3/pipelines_spec.rb
+2
-2
spec/requests/api/v3/project_hooks_spec.rb
spec/requests/api/v3/project_hooks_spec.rb
+3
-3
spec/requests/api/v3/projects_spec.rb
spec/requests/api/v3/projects_spec.rb
+5
-5
spec/requests/api/v3/todos_spec.rb
spec/requests/api/v3/todos_spec.rb
+2
-2
spec/requests/git_http_spec.rb
spec/requests/git_http_spec.rb
+8
-8
spec/requests/lfs_http_spec.rb
spec/requests/lfs_http_spec.rb
+15
-15
spec/requests/projects/cycle_analytics_events_spec.rb
spec/requests/projects/cycle_analytics_events_spec.rb
+1
-1
spec/services/boards/issues/create_service_spec.rb
spec/services/boards/issues/create_service_spec.rb
+1
-1
spec/services/boards/issues/list_service_spec.rb
spec/services/boards/issues/list_service_spec.rb
+1
-1
spec/services/boards/issues/move_service_spec.rb
spec/services/boards/issues/move_service_spec.rb
+1
-1
spec/services/boards/lists/create_service_spec.rb
spec/services/boards/lists/create_service_spec.rb
+1
-1
spec/services/boards/lists/generate_service_spec.rb
spec/services/boards/lists/generate_service_spec.rb
+1
-1
spec/services/ci/stop_environments_service_spec.rb
spec/services/ci/stop_environments_service_spec.rb
+3
-3
spec/services/delete_branch_service_spec.rb
spec/services/delete_branch_service_spec.rb
+1
-1
spec/services/discussions/resolve_service_spec.rb
spec/services/discussions/resolve_service_spec.rb
+1
-1
spec/services/files/delete_service_spec.rb
spec/services/files/delete_service_spec.rb
+1
-1
spec/services/files/multi_service_spec.rb
spec/services/files/multi_service_spec.rb
+1
-1
spec/services/files/update_service_spec.rb
spec/services/files/update_service_spec.rb
+1
-1
spec/services/git_push_service_spec.rb
spec/services/git_push_service_spec.rb
+6
-6
spec/services/git_tag_push_service_spec.rb
spec/services/git_tag_push_service_spec.rb
+1
-1
spec/services/issuable/bulk_update_service_spec.rb
spec/services/issuable/bulk_update_service_spec.rb
+4
-4
spec/services/issues/build_service_spec.rb
spec/services/issues/build_service_spec.rb
+1
-1
spec/services/issues/close_service_spec.rb
spec/services/issues/close_service_spec.rb
+3
-3
spec/services/issues/create_service_spec.rb
spec/services/issues/create_service_spec.rb
+9
-9
spec/services/issues/move_service_spec.rb
spec/services/issues/move_service_spec.rb
+8
-8
spec/services/issues/reopen_service_spec.rb
spec/services/issues/reopen_service_spec.rb
+2
-2
spec/services/issues/resolve_discussions_spec.rb
spec/services/issues/resolve_discussions_spec.rb
+1
-1
spec/services/issues/update_service_spec.rb
spec/services/issues/update_service_spec.rb
+6
-6
spec/services/labels/find_or_create_service_spec.rb
spec/services/labels/find_or_create_service_spec.rb
+1
-1
spec/services/members/approve_access_request_service_spec.rb
spec/services/members/approve_access_request_service_spec.rb
+1
-1
spec/services/members/authorized_destroy_service_spec.rb
spec/services/members/authorized_destroy_service_spec.rb
+2
-2
spec/services/members/create_service_spec.rb
spec/services/members/create_service_spec.rb
+1
-1
spec/services/members/destroy_service_spec.rb
spec/services/members/destroy_service_spec.rb
+2
-2
spec/services/merge_requests/assign_issues_service_spec.rb
spec/services/merge_requests/assign_issues_service_spec.rb
+1
-1
spec/services/merge_requests/build_service_spec.rb
spec/services/merge_requests/build_service_spec.rb
+1
-1
spec/services/merge_requests/close_service_spec.rb
spec/services/merge_requests/close_service_spec.rb
+3
-3
spec/services/merge_requests/create_service_spec.rb
spec/services/merge_requests/create_service_spec.rb
+9
-9
spec/services/merge_requests/ff_merge_service_spec.rb
spec/services/merge_requests/ff_merge_service_spec.rb
+2
-2
spec/services/merge_requests/post_merge_service_spec.rb
spec/services/merge_requests/post_merge_service_spec.rb
+1
-1
spec/services/merge_requests/refresh_service_spec.rb
spec/services/merge_requests/refresh_service_spec.rb
+2
-2
spec/services/merge_requests/reopen_service_spec.rb
spec/services/merge_requests/reopen_service_spec.rb
+3
-3
spec/services/merge_requests/update_service_spec.rb
spec/services/merge_requests/update_service_spec.rb
+5
-5
spec/services/milestones/close_service_spec.rb
spec/services/milestones/close_service_spec.rb
+1
-1
spec/services/milestones/create_service_spec.rb
spec/services/milestones/create_service_spec.rb
+1
-1
spec/services/milestones/destroy_service_spec.rb
spec/services/milestones/destroy_service_spec.rb
+1
-1
spec/services/notes/create_service_spec.rb
spec/services/notes/create_service_spec.rb
+1
-1
spec/services/notes/post_process_service_spec.rb
spec/services/notes/post_process_service_spec.rb
+1
-1
spec/services/notes/quick_actions_service_spec.rb
spec/services/notes/quick_actions_service_spec.rb
+5
-5
spec/services/notes/update_service_spec.rb
spec/services/notes/update_service_spec.rb
+3
-3
spec/services/projects/autocomplete_service_spec.rb
spec/services/projects/autocomplete_service_spec.rb
+2
-2
spec/services/quick_actions/interpret_service_spec.rb
spec/services/quick_actions/interpret_service_spec.rb
+2
-2
spec/services/search/snippet_service_spec.rb
spec/services/search/snippet_service_spec.rb
+1
-1
spec/services/todo_service_spec.rb
spec/services/todo_service_spec.rb
+5
-5
spec/support/api/milestones_shared_examples.rb
spec/support/api/milestones_shared_examples.rb
+2
-2
spec/support/features/issuable_slash_commands_shared_examples.rb
...pport/features/issuable_slash_commands_shared_examples.rb
+1
-1
spec/support/markdown_feature.rb
spec/support/markdown_feature.rb
+2
-2
spec/support/mentionable_shared_examples.rb
spec/support/mentionable_shared_examples.rb
+1
-1
spec/support/reference_parser_shared_examples.rb
spec/support/reference_parser_shared_examples.rb
+1
-1
spec/support/services/issuable_create_service_slash_commands_shared_examples.rb
...issuable_create_service_slash_commands_shared_examples.rb
+2
-2
spec/support/updating_mentions_shared_examples.rb
spec/support/updating_mentions_shared_examples.rb
+1
-1
spec/views/projects/imports/new.html.haml_spec.rb
spec/views/projects/imports/new.html.haml_spec.rb
+1
-1
spec/views/shared/notes/_form.html.haml_spec.rb
spec/views/shared/notes/_form.html.haml_spec.rb
+1
-1
spec/workers/merge_worker_spec.rb
spec/workers/merge_worker_spec.rb
+1
-1
No files found.
app/models/project.rb
View file @
27c95364
...
...
@@ -226,7 +226,7 @@ class Project < ActiveRecord::Base
delegate
:name
,
to: :owner
,
allow_nil:
true
,
prefix:
true
delegate
:members
,
to: :team
,
prefix:
true
delegate
:add_user
,
:add_users
,
to: :team
delegate
:add_guest
,
:add_reporter
,
:add_developer
,
:add_master
,
to: :team
delegate
:add_guest
,
:add_reporter
,
:add_developer
,
:add_master
,
:add_role
,
to: :team
# Validations
validates
:creator
,
presence:
true
,
on: :create
...
...
app/models/project_team.rb
View file @
27c95364
...
...
@@ -7,36 +7,24 @@ class ProjectTeam
@project
=
project
end
# Shortcut to add users
#
# Use:
# @team << [@user, :master]
# @team << [@users, :master]
#
def
<<
(
args
)
users
,
access
,
current_user
=
*
args
if
users
.
respond_to?
(
:each
)
add_users
(
users
,
access
,
current_user:
current_user
)
else
add_user
(
users
,
access
,
current_user:
current_user
)
end
end
def
add_guest
(
user
,
current_user:
nil
)
self
<<
[
user
,
:guest
,
current_user
]
add_user
(
user
,
:guest
,
current_user:
current_user
)
end
def
add_reporter
(
user
,
current_user:
nil
)
self
<<
[
user
,
:reporter
,
current_user
]
add_user
(
user
,
:reporter
,
current_user:
current_user
)
end
def
add_developer
(
user
,
current_user:
nil
)
self
<<
[
user
,
:developer
,
current_user
]
add_user
(
user
,
:developer
,
current_user:
current_user
)
end
def
add_master
(
user
,
current_user:
nil
)
self
<<
[
user
,
:master
,
current_user
]
add_user
(
user
,
:master
,
current_user:
current_user
)
end
def
add_role
(
user
,
role
,
current_user:
nil
)
send
(
:"add_
#{
role
}
"
,
user
,
current_user:
current_user
)
# rubocop:disable GitlabSecurity/PublicSend
end
def
find_member
(
user_id
)
...
...
changelogs/unreleased/36782-replace-team-user-role-with-add_role-user-in-specs.yml
0 → 100644
View file @
27c95364
---
title
:
Replace '.team << [user, role]' with 'add_role(user)' in specs
merge_request
:
16069
author
:
"
@blackst0ne"
type
:
other
db/fixtures/development/06_teams.rb
View file @
27c95364
...
...
@@ -14,7 +14,7 @@ Sidekiq::Testing.inline! do
Project
.
all
.
each
do
|
project
|
User
.
all
.
sample
(
4
).
each
do
|
user
|
if
project
.
team
<<
[
user
,
Gitlab
::
Access
.
values
.
sample
]
if
project
.
add_role
(
user
,
Gitlab
::
Access
.
values
.
sample
)
print
'.'
else
print
'F'
...
...
features/steps/profile/profile.rb
View file @
27c95364
...
...
@@ -165,7 +165,7 @@ class Spinach::Features::Profile < Spinach::FeatureSteps
@project
=
create
(
:project
,
:repository
,
namespace:
@group
)
@event
=
create
(
:closed_issue_event
,
project:
@project
)
@project
.
team
<<
[
current_user
,
:master
]
@project
.
add_master
(
current_user
)
end
step
'I should see groups I belong to'
do
...
...
features/steps/project/deploy_keys.rb
View file @
27c95364
...
...
@@ -48,11 +48,11 @@ class Spinach::Features::ProjectDeployKeys < Spinach::FeatureSteps
step
'other projects have deploy keys'
do
@second_project
=
create
(
:project
,
namespace:
create
(
:group
))
@second_project
.
team
<<
[
current_user
,
:master
]
@second_project
.
add_master
(
current_user
)
create
(
:deploy_keys_project
,
project:
@second_project
)
@third_project
=
create
(
:project
,
namespace:
create
(
:group
))
@third_project
.
team
<<
[
current_user
,
:master
]
@third_project
.
add_master
(
current_user
)
create
(
:deploy_keys_project
,
project:
@third_project
,
deploy_key:
@second_project
.
deploy_keys
.
first
)
end
...
...
features/steps/project/fork.rb
View file @
27c95364
...
...
@@ -10,7 +10,7 @@ class Spinach::Features::ProjectFork < Spinach::FeatureSteps
step
'I am a member of project "Shop"'
do
@project
=
create
(
:project
,
:repository
,
name:
"Shop"
)
@project
.
team
<<
[
@user
,
:reporter
]
@project
.
add_reporter
(
@user
)
end
step
'I should see the forked project page'
do
...
...
@@ -71,7 +71,7 @@ class Spinach::Features::ProjectFork < Spinach::FeatureSteps
step
'There is an existent fork of the "Shop" project'
do
user
=
create
(
:user
,
name:
'Mike'
)
@project
.
team
<<
[
user
,
:reporter
]
@project
.
add_reporter
(
user
)
@forked_project
=
Projects
::
ForkService
.
new
(
@project
,
user
).
execute
end
...
...
features/steps/project/forked_merge_requests.rb
View file @
27c95364
...
...
@@ -10,7 +10,7 @@ class Spinach::Features::ProjectForkedMergeRequests < Spinach::FeatureSteps
step
'I am a member of project "Shop"'
do
@project
=
::
Project
.
find_by
(
name:
"Shop"
)
@project
||=
create
(
:project
,
:repository
,
name:
"Shop"
)
@project
.
team
<<
[
@user
,
:reporter
]
@project
.
add_reporter
(
@user
)
end
step
'I have a project forked off of "Shop" called "Forked Shop"'
do
...
...
features/steps/project/source/browse_files.rb
View file @
27c95364
...
...
@@ -8,7 +8,7 @@ class Spinach::Features::ProjectSourceBrowseFiles < Spinach::FeatureSteps
step
"I don't have write access"
do
@project
=
create
(
:project
,
:repository
,
name:
"Other Project"
,
path:
"other-project"
)
@project
.
team
<<
[
@user
,
:reporter
]
@project
.
add_reporter
(
@user
)
visit
project_tree_path
(
@project
,
root_ref
)
end
...
...
features/steps/project/source/markdown_render.rb
View file @
27c95364
...
...
@@ -10,7 +10,7 @@ class Spinach::Features::ProjectSourceMarkdownRender < Spinach::FeatureSteps
step
'I own project "Delta"'
do
@project
=
::
Project
.
find_by
(
name:
"Delta"
)
@project
||=
create
(
:project
,
:repository
,
name:
"Delta"
,
namespace:
@user
.
namespace
)
@project
.
team
<<
[
@user
,
:master
]
@project
.
add_master
(
@user
)
end
step
'I should see files from repository in markdown'
do
...
...
features/steps/shared/group.rb
View file @
27c95364
...
...
@@ -41,7 +41,7 @@ module SharedGroup
group
.
add_user
(
user
,
role
)
project
||=
create
(
:project
,
:repository
,
namespace:
group
)
create
(
:closed_issue_event
,
project:
project
)
project
.
team
<<
[
user
,
:master
]
project
.
add_master
(
user
)
end
def
owned_group
...
...
features/steps/shared/project.rb
View file @
27c95364
...
...
@@ -4,13 +4,13 @@ module SharedProject
# Create a project without caring about what it's called
step
"I own a project"
do
@project
=
create
(
:project
,
:repository
,
namespace:
@user
.
namespace
)
@project
.
team
<<
[
@user
,
:master
]
@project
.
add_master
(
@user
)
end
step
"I own a project in some group namespace"
do
@group
=
create
(
:group
,
name:
'some group'
)
@project
=
create
(
:project
,
namespace:
@group
)
@project
.
team
<<
[
@user
,
:master
]
@project
.
add_master
(
@user
)
end
step
"project exists in some group namespace"
do
...
...
@@ -22,7 +22,7 @@ module SharedProject
step
'I own project "Shop"'
do
@project
=
Project
.
find_by
(
name:
"Shop"
)
@project
||=
create
(
:project
,
:repository
,
name:
"Shop"
,
namespace:
@user
.
namespace
)
@project
.
team
<<
[
@user
,
:master
]
@project
.
add_master
(
@user
)
end
step
'I disable snippets in project'
do
...
...
@@ -40,7 +40,7 @@ module SharedProject
step
'I add a user to project "Shop"'
do
@project
=
Project
.
find_by
(
name:
"Shop"
)
other_user
=
create
(
:user
,
name:
'Alpha'
)
@project
.
team
<<
[
other_user
,
:master
]
@project
.
add_master
(
other_user
)
end
# Create another specific project called "Forum"
...
...
@@ -49,14 +49,13 @@ module SharedProject
@project
||=
create
(
:project
,
:repository
,
name:
"Forum"
,
namespace:
@user
.
namespace
,
path:
'forum_project'
)
@project
.
build_project_feature
@project
.
project_feature
.
save
@project
.
team
<<
[
@user
,
:master
]
@project
.
add_master
(
@user
)
end
# Create an empty project without caring about the name
step
'I own an empty project'
do
@project
=
create
(
:project
,
name:
'Empty Project'
,
namespace:
@user
.
namespace
)
@project
.
team
<<
[
@user
,
:master
]
@project
=
create
(
:project
,
name:
'Empty Project'
,
namespace:
@user
.
namespace
)
@project
.
add_master
(
@user
)
end
step
'I visit my empty project page'
do
...
...
@@ -101,11 +100,11 @@ module SharedProject
# ----------------------------------------
step
'I am member of a project with a guest role'
do
@project
.
team
<<
[
@user
,
Gitlab
::
Access
::
GUEST
]
@project
.
add_guest
(
@user
)
end
step
'I am member of a project with a reporter role'
do
@project
.
team
<<
[
@user
,
Gitlab
::
Access
::
REPORTER
]
@project
.
add_reporter
(
@user
)
end
# ----------------------------------------
...
...
@@ -245,6 +244,6 @@ module SharedProject
user
=
user_exists
(
user_name
,
username:
user_name
.
gsub
(
/\s/
,
''
).
underscore
)
project
=
Project
.
find_by
(
name:
project_name
)
project
||=
create
(
:project
,
visibility
,
name:
project_name
,
namespace:
user
.
namespace
)
project
.
team
<<
[
user
,
:master
]
project
.
add_master
(
user
)
end
end
spec/controllers/admin/users_controller_spec.rb
View file @
27c95364
...
...
@@ -13,7 +13,7 @@ describe Admin::UsersController do
let!
(
:issue
)
{
create
(
:issue
,
author:
user
)
}
before
do
project
.
team
<<
[
user
,
:developer
]
project
.
add_developer
(
user
)
end
it
'deletes user and ghosts their contributions'
do
...
...
spec/controllers/boards/issues_controller_spec.rb
View file @
27c95364
...
...
@@ -13,8 +13,8 @@ describe Boards::IssuesController do
let!
(
:list2
)
{
create
(
:list
,
board:
board
,
label:
development
,
position:
1
)
}
before
do
project
.
team
<<
[
user
,
:master
]
project
.
team
<<
[
guest
,
:guest
]
project
.
add_master
(
user
)
project
.
add_guest
(
guest
)
end
describe
'GET index'
do
...
...
@@ -221,7 +221,7 @@ describe Boards::IssuesController do
let
(
:guest
)
{
create
(
:user
)
}
before
do
project
.
team
<<
[
guest
,
:guest
]
project
.
add_guest
(
guest
)
end
it
'returns a forbidden 403 response'
do
...
...
spec/controllers/boards/lists_controller_spec.rb
View file @
27c95364
...
...
@@ -7,8 +7,8 @@ describe Boards::ListsController do
let
(
:guest
)
{
create
(
:user
)
}
before
do
project
.
team
<<
[
user
,
:master
]
project
.
team
<<
[
guest
,
:guest
]
project
.
add_master
(
user
)
project
.
add_guest
(
guest
)
end
describe
'GET index'
do
...
...
spec/controllers/dashboard/milestones_controller_spec.rb
View file @
27c95364
...
...
@@ -17,7 +17,7 @@ describe Dashboard::MilestonesController do
before
do
sign_in
(
user
)
project
.
team
<<
[
user
,
:master
]
project
.
add_master
(
user
)
end
it_behaves_like
'milestone tabs'
...
...
spec/controllers/dashboard/todos_controller_spec.rb
View file @
27c95364
...
...
@@ -8,7 +8,7 @@ describe Dashboard::TodosController do
before
do
sign_in
(
user
)
project
.
team
<<
[
user
,
:developer
]
project
.
add_developer
(
user
)
end
describe
'GET #index'
do
...
...
spec/controllers/dashboard_controller_spec.rb
View file @
27c95364
...
...
@@ -5,7 +5,7 @@ describe DashboardController do
let
(
:project
)
{
create
(
:project
)
}
before
do
project
.
team
<<
[
user
,
:master
]
project
.
add_master
(
user
)
sign_in
(
user
)
end
...
...
spec/controllers/groups/milestones_controller_spec.rb
View file @
27c95364
...
...
@@ -28,7 +28,7 @@ describe Groups::MilestonesController do
before
do
sign_in
(
user
)
group
.
add_owner
(
user
)
project
.
team
<<
[
user
,
:master
]
project
.
add_master
(
user
)
end
describe
'#index'
do
...
...
spec/controllers/notification_settings_controller_spec.rb
View file @
27c95364
...
...
@@ -6,7 +6,7 @@ describe NotificationSettingsController do
let
(
:user
)
{
create
(
:user
)
}
before
do
project
.
team
<<
[
user
,
:developer
]
project
.
add_developer
(
user
)
end
describe
'#create'
do
...
...
spec/controllers/projects/avatars_controller_spec.rb
View file @
27c95364
...
...
@@ -6,7 +6,7 @@ describe Projects::AvatarsController do
before
do
sign_in
(
user
)
project
.
team
<<
[
user
,
:master
]
project
.
add_master
(
user
)
controller
.
instance_variable_set
(
:@project
,
project
)
end
...
...
spec/controllers/projects/blame_controller_spec.rb
View file @
27c95364
...
...
@@ -7,7 +7,7 @@ describe Projects::BlameController do
before
do
sign_in
(
user
)
project
.
team
<<
[
user
,
:master
]
project
.
add_master
(
user
)
controller
.
instance_variable_set
(
:@project
,
project
)
end
...
...
spec/controllers/projects/blob_controller_spec.rb
View file @
27c95364
...
...
@@ -89,7 +89,7 @@ describe Projects::BlobController do
end
before
do
project
.
team
<<
[
user
,
:master
]
project
.
add_master
(
user
)
sign_in
(
user
)
end
...
...
@@ -147,7 +147,7 @@ describe Projects::BlobController do
let
(
:developer
)
{
create
(
:user
)
}
before
do
project
.
team
<<
[
developer
,
:developer
]
project
.
add_developer
(
developer
)
sign_in
(
developer
)
get
:edit
,
default_params
end
...
...
@@ -161,7 +161,7 @@ describe Projects::BlobController do
let
(
:master
)
{
create
(
:user
)
}
before
do
project
.
team
<<
[
master
,
:master
]
project
.
add_master
(
master
)
sign_in
(
master
)
get
:edit
,
default_params
end
...
...
@@ -190,7 +190,7 @@ describe Projects::BlobController do
end
before
do
project
.
team
<<
[
user
,
:master
]
project
.
add_master
(
user
)
sign_in
(
user
)
end
...
...
spec/controllers/projects/boards_controller_spec.rb
View file @
27c95364
...
...
@@ -5,7 +5,7 @@ describe Projects::BoardsController do
let
(
:user
)
{
create
(
:user
)
}
before
do
project
.
team
<<
[
user
,
:master
]
project
.
add_master
(
user
)
sign_in
(
user
)
end
...
...
spec/controllers/projects/branches_controller_spec.rb
View file @
27c95364
...
...
@@ -6,8 +6,8 @@ describe Projects::BranchesController do
let
(
:developer
)
{
create
(
:user
)
}
before
do
project
.
team
<<
[
user
,
:master
]
project
.
team
<<
[
user
,
:developer
]
project
.
add_master
(
user
)
project
.
add_developer
(
user
)
allow
(
project
).
to
receive
(
:branches
).
and_return
([
'master'
,
'foo/bar/baz'
])
allow
(
project
).
to
receive
(
:tags
).
and_return
([
'v1.0.0'
,
'v2.0.0'
])
...
...
spec/controllers/projects/commits_controller_spec.rb
View file @
27c95364
...
...
@@ -6,7 +6,7 @@ describe Projects::CommitsController do
before
do
sign_in
(
user
)
project
.
team
<<
[
user
,
:master
]
project
.
add_master
(
user
)
end
describe
"GET show"
do
...
...
spec/controllers/projects/compare_controller_spec.rb
View file @
27c95364
...
...
@@ -8,7 +8,7 @@ describe Projects::CompareController do
before
do
sign_in
(
user
)
project
.
team
<<
[
user
,
:master
]
project
.
add_master
(
user
)
end
it
'compare shows some diffs'
do
...
...
spec/controllers/projects/cycle_analytics_controller_spec.rb
View file @
27c95364
...
...
@@ -6,7 +6,7 @@ describe Projects::CycleAnalyticsController do
before
do
sign_in
(
user
)
project
.
team
<<
[
user
,
:master
]
project
.
add_master
(
user
)
end
describe
'cycle analytics not set up flag'
do
...
...
spec/controllers/projects/deploy_keys_controller_spec.rb
View file @
27c95364
...
...
@@ -5,7 +5,7 @@ describe Projects::DeployKeysController do
let
(
:user
)
{
create
(
:user
)
}
before
do
project
.
team
<<
[
user
,
:master
]
project
.
add_master
(
user
)
sign_in
(
user
)
end
...
...
@@ -48,7 +48,7 @@ describe Projects::DeployKeysController do
end
before
do
project2
.
team
<<
[
user
,
:developer
]
project2
.
add_developer
(
user
)
end
it
'returns json in a correct format'
do
...
...
spec/controllers/projects/deployments_controller_spec.rb
View file @
27c95364
...
...
@@ -8,7 +8,7 @@ describe Projects::DeploymentsController do
let
(
:environment
)
{
create
(
:environment
,
name:
'production'
,
project:
project
)
}
before
do
project
.
team
<<
[
user
,
:master
]
project
.
add_master
(
user
)
sign_in
(
user
)
end
...
...
spec/controllers/projects/discussions_controller_spec.rb
View file @
27c95364
...
...
@@ -31,7 +31,7 @@ describe Projects::DiscussionsController do
context
"when the user is authorized to resolve the discussion"
do
before
do