Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'spec/lib/gitlab/satellite/merge_action_spec.rb')
-rw-r--r--spec/lib/gitlab/satellite/merge_action_spec.rb6
1 files changed, 0 insertions, 6 deletions
diff --git a/spec/lib/gitlab/satellite/merge_action_spec.rb b/spec/lib/gitlab/satellite/merge_action_spec.rb
index 3f6e5c35245..2478efe8493 100644
--- a/spec/lib/gitlab/satellite/merge_action_spec.rb
+++ b/spec/lib/gitlab/satellite/merge_action_spec.rb
@@ -11,7 +11,6 @@ describe 'Gitlab::Satellite::MergeAction' do
#these commits are quite close together, itended to make string diffs/format patches small
@close_commit1 = ['2_3_notes_fix', '8470d70da67355c9c009e4401746b1d5410af2e3']
@close_commit2 = ['scss_refactoring', 'f0f14c8eaba69ebddd766498a9d0b0e79becd633']
-
end
let(:project) { create(:project_with_code) }
@@ -53,7 +52,6 @@ describe 'Gitlab::Satellite::MergeAction' do
end
end
-
describe '#format_patch' do
context 'on fork' do
it 'should build a format patch' do
@@ -76,7 +74,6 @@ describe 'Gitlab::Satellite::MergeAction' do
end
end
-
describe '#diffs_between_satellite tested against diff_in_satellite' do
def is_a_matching_diff(diff, diffs)
@@ -109,7 +106,6 @@ describe 'Gitlab::Satellite::MergeAction' do
merge_request.source_branch = @master[0]
diffs = Gitlab::Satellite::MergeAction.new(merge_request.author, merge_request).diffs_between_satellite
-
merge_request.target_branch = @close_commit1[0]
merge_request.source_branch = @master[0]
diff = Gitlab::Satellite::MergeAction.new(merge_request.author, merge_request).diff_in_satellite
@@ -119,7 +115,6 @@ describe 'Gitlab::Satellite::MergeAction' do
end
end
-
describe '#can_be_merged?' do
context 'on fork' do
it 'return true or false depending on if something is mergable' do
@@ -145,5 +140,4 @@ describe 'Gitlab::Satellite::MergeAction' do
end
end
end
-
end \ No newline at end of file