Skip to content

Commit 58f3b4c

Browse files
committed
Fix unit test
1 parent cc18530 commit 58f3b4c

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

spec/create_release_backmerge_pull_request_spec.rb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ def stub_expected_pull_requests(expected_backmerge_branches:, source_branch:, la
5252
allow(described_class).to receive(:can_merge?).with(head, into: base).and_return(false)
5353
end
5454

55-
allow(other_action_mock).to receive(:ensure_git_branch).with({ branch: "^#{expected_intermediate_branch}$" }).and_return(true)
55+
allow(Fastlane::Helper::GitHelper).to receive(:current_git_branch).and_return(expected_intermediate_branch)
5656

5757
next unless nothing_to_merge_between.nil? || nothing_to_merge_between.empty?
5858

@@ -418,7 +418,8 @@ def stub_expected_pull_requests(expected_backmerge_branches:, source_branch:, la
418418
)
419419

420420
intermediate_branch = "merge/release-30.6-into-#{default_branch}"
421-
expect(other_action_mock).to receive(:ensure_git_branch).with(branch: "^#{intermediate_branch}$")
421+
allow(Fastlane::Helper::GitHelper).to receive(:current_git_branch).and_return(intermediate_branch)
422+
422423
allow(Fastlane::UI).to receive(:message).with(anything)
423424
expect(Fastlane::UI).to receive(:message).with("branch created callback was called! #{default_branch} #{intermediate_branch}")
424425

0 commit comments

Comments
 (0)