diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-24 09:09:01 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-24 09:09:01 +0300 |
commit | fa7ac2663b53f61551b9db51f16d55fa4e5b74c3 (patch) | |
tree | 0cbf33baee16b10803c1d23ec9e0c06e238e43f5 /spec/services/branches | |
parent | 4870899d6cec693b58acbef91636e1310160fa28 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/services/branches')
5 files changed, 5 insertions, 5 deletions
diff --git a/spec/services/branches/create_service_spec.rb b/spec/services/branches/create_service_spec.rb index 072a86d17fc..b682a3f26ec 100644 --- a/spec/services/branches/create_service_spec.rb +++ b/spec/services/branches/create_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Branches::CreateService do +RSpec.describe Branches::CreateService do subject(:service) { described_class.new(project, user) } let_it_be(:project) { create(:project_empty_repo) } diff --git a/spec/services/branches/delete_merged_service_spec.rb b/spec/services/branches/delete_merged_service_spec.rb index 5c87f156ec7..2cf0f53c8c3 100644 --- a/spec/services/branches/delete_merged_service_spec.rb +++ b/spec/services/branches/delete_merged_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Branches::DeleteMergedService do +RSpec.describe Branches::DeleteMergedService do include ProjectForksHelper subject(:service) { described_class.new(project, project.owner) } diff --git a/spec/services/branches/delete_service_spec.rb b/spec/services/branches/delete_service_spec.rb index 2219416d94d..b57817e9f59 100644 --- a/spec/services/branches/delete_service_spec.rb +++ b/spec/services/branches/delete_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Branches::DeleteService do +RSpec.describe Branches::DeleteService do let(:project) { create(:project, :repository) } let(:repository) { project.repository } let(:user) { create(:user) } diff --git a/spec/services/branches/diverging_commit_counts_service_spec.rb b/spec/services/branches/diverging_commit_counts_service_spec.rb index 370da773ab2..34a2b81c831 100644 --- a/spec/services/branches/diverging_commit_counts_service_spec.rb +++ b/spec/services/branches/diverging_commit_counts_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Branches::DivergingCommitCountsService do +RSpec.describe Branches::DivergingCommitCountsService do let(:project) { create(:project, :repository) } let(:repository) { project.repository } diff --git a/spec/services/branches/validate_new_service_spec.rb b/spec/services/branches/validate_new_service_spec.rb index 6d5078d3ccb..02127c8c10d 100644 --- a/spec/services/branches/validate_new_service_spec.rb +++ b/spec/services/branches/validate_new_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Branches::ValidateNewService do +RSpec.describe Branches::ValidateNewService do let(:project) { create(:project, :repository) } subject(:service) { described_class.new(project) } |