diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-17 12:06:48 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-17 12:06:48 +0000 |
| commit | bd860c22f6a4b9473cbddd34a53eead8235a7ea1 (patch) | |
| tree | 3f955a56c2ac90497863da26902a42dba49f3466 /spec/services | |
| parent | e567b4c2df7dc4085d213db029eff6b6fcde0152 (diff) | |
| download | gitlab-ce-bd860c22f6a4b9473cbddd34a53eead8235a7ea1.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/services')
| -rw-r--r-- | spec/services/git/branch_push_service_spec.rb | 2 | ||||
| -rw-r--r-- | spec/services/issues/update_service_spec.rb | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/spec/services/git/branch_push_service_spec.rb b/spec/services/git/branch_push_service_spec.rb index c3a4f3dbe3f..f4d1a1e34cd 100644 --- a/spec/services/git/branch_push_service_spec.rb +++ b/spec/services/git/branch_push_service_spec.rb @@ -197,7 +197,7 @@ describe Git::BranchPushService, services: true do create(:protected_branch, :no_one_can_push, :developers_can_merge, project: project, name: 'master') expect(project).to receive(:execute_hooks) expect(project.default_branch).to eq("master") - expect_any_instance_of(ProtectedBranches::CreateService).not_to receive(:execute) + expect(ProtectedBranches::CreateService).not_to receive(:new) execute_service(project, user, blankrev, 'newrev', ref) diff --git a/spec/services/issues/update_service_spec.rb b/spec/services/issues/update_service_spec.rb index fd9a63b79cc..55254b61ac8 100644 --- a/spec/services/issues/update_service_spec.rb +++ b/spec/services/issues/update_service_spec.rb @@ -1,4 +1,3 @@ -# coding: utf-8 # frozen_string_literal: true require 'spec_helper' |