diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-24 00:08:51 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-24 00:08:51 +0000 |
commit | 1ce6af4aad0107b6d604f89a3c0b530476a10165 (patch) | |
tree | 4956b0d395cd9232bca14f83daca3cd8616cc842 /spec/controllers | |
parent | 24256212ea84e6fb6509f6fb317a2d2bac3d0d06 (diff) | |
download | gitlab-ce-1ce6af4aad0107b6d604f89a3c0b530476a10165.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/controllers')
9 files changed, 22 insertions, 0 deletions
diff --git a/spec/controllers/import/bitbucket_controller_spec.rb b/spec/controllers/import/bitbucket_controller_spec.rb index d013bd6d427..74ffcc3aeef 100644 --- a/spec/controllers/import/bitbucket_controller_spec.rb +++ b/spec/controllers/import/bitbucket_controller_spec.rb @@ -136,6 +136,8 @@ describe Import::BitbucketController do expect(response).to have_gitlab_http_status(422) end + it_behaves_like 'project import rate limiter' + context "when the repository owner is the Bitbucket user" do context "when the Bitbucket user and GitLab user's usernames match" do it "takes the current user's namespace" do diff --git a/spec/controllers/import/bitbucket_server_controller_spec.rb b/spec/controllers/import/bitbucket_server_controller_spec.rb index f30eace7d30..a84f8368198 100644 --- a/spec/controllers/import/bitbucket_server_controller_spec.rb +++ b/spec/controllers/import/bitbucket_server_controller_spec.rb @@ -102,6 +102,8 @@ describe Import::BitbucketServerController do expect(response).to have_gitlab_http_status(422) end + + it_behaves_like 'project import rate limiter' end describe 'POST configure' do diff --git a/spec/controllers/import/fogbugz_controller_spec.rb b/spec/controllers/import/fogbugz_controller_spec.rb index f7c813576aa..9a647b8caae 100644 --- a/spec/controllers/import/fogbugz_controller_spec.rb +++ b/spec/controllers/import/fogbugz_controller_spec.rb @@ -75,4 +75,8 @@ describe Import::FogbugzController do expect(assigns(:repos)).to eq([]) end end + + describe 'POST create' do + it_behaves_like 'project import rate limiter' + end end diff --git a/spec/controllers/import/gitea_controller_spec.rb b/spec/controllers/import/gitea_controller_spec.rb index b7bdfcc3dc6..730e3f98c98 100644 --- a/spec/controllers/import/gitea_controller_spec.rb +++ b/spec/controllers/import/gitea_controller_spec.rb @@ -41,6 +41,8 @@ describe Import::GiteaController do assign_host_url end end + + it_behaves_like 'project import rate limiter' end describe "GET realtime_changes" do diff --git a/spec/controllers/import/github_controller_spec.rb b/spec/controllers/import/github_controller_spec.rb index 5675798ac33..54fbe624cb7 100644 --- a/spec/controllers/import/github_controller_spec.rb +++ b/spec/controllers/import/github_controller_spec.rb @@ -71,6 +71,8 @@ describe Import::GithubController do describe "POST create" do it_behaves_like 'a GitHub-ish import controller: POST create' + + it_behaves_like 'project import rate limiter' end describe "GET realtime_changes" do diff --git a/spec/controllers/import/gitlab_controller_spec.rb b/spec/controllers/import/gitlab_controller_spec.rb index 6a3713a1212..495ea62456c 100644 --- a/spec/controllers/import/gitlab_controller_spec.rb +++ b/spec/controllers/import/gitlab_controller_spec.rb @@ -282,6 +282,8 @@ describe Import::GitlabController do expect(response).to have_gitlab_http_status(422) end end + + it_behaves_like 'project import rate limiter' end end end diff --git a/spec/controllers/import/gitlab_projects_controller_spec.rb b/spec/controllers/import/gitlab_projects_controller_spec.rb index a3f6d8dcea2..285291c53fa 100644 --- a/spec/controllers/import/gitlab_projects_controller_spec.rb +++ b/spec/controllers/import/gitlab_projects_controller_spec.rb @@ -36,5 +36,7 @@ describe Import::GitlabProjectsController do expect(response).to have_gitlab_http_status(302) end end + + it_behaves_like 'project import rate limiter' end end diff --git a/spec/controllers/import/google_code_controller_spec.rb b/spec/controllers/import/google_code_controller_spec.rb index 17be91c0bbb..3773f691ed0 100644 --- a/spec/controllers/import/google_code_controller_spec.rb +++ b/spec/controllers/import/google_code_controller_spec.rb @@ -58,4 +58,8 @@ describe Import::GoogleCodeController do expect(assigns(:incompatible_repos)).to eq([@repo]) end end + + describe "POST create" do + it_behaves_like 'project import rate limiter' + end end diff --git a/spec/controllers/import/phabricator_controller_spec.rb b/spec/controllers/import/phabricator_controller_spec.rb index a127e3cda3a..62a719cfb5b 100644 --- a/spec/controllers/import/phabricator_controller_spec.rb +++ b/spec/controllers/import/phabricator_controller_spec.rb @@ -88,5 +88,7 @@ describe Import::PhabricatorController do expect { post_create }.not_to change { current_user.namespace.projects.reload.size } end end + + it_behaves_like 'project import rate limiter' end end |