From 93ab68607922e0bd0e22c40528a9d58fc50f50cd Mon Sep 17 00:00:00 2001
From: Sean McGivern <sean@gitlab.com>
Date: Mon, 11 Jul 2016 10:58:01 +0100
Subject: [PATCH] Fix feature specs on CI
MySQL's text column isn't big enough for the diffs in the
expand-collapse-diffs branch.
---
.../expand_collapse_diffs_spec.rb | 14 ++++-----
spec/support/test_env.rb | 29 +++++++++----------
2 files changed, 21 insertions(+), 22 deletions(-)
rename spec/features/{merge_requests => }/expand_collapse_diffs_spec.rb (92%)
diff --git a/spec/features/merge_requests/expand_collapse_diffs_spec.rb b/spec/features/expand_collapse_diffs_spec.rb
similarity index 92%
rename from spec/features/merge_requests/expand_collapse_diffs_spec.rb
rename to spec/features/expand_collapse_diffs_spec.rb
index 7a05bb47979..7cff196c8d9 100644
--- a/spec/features/merge_requests/expand_collapse_diffs_spec.rb
+++ b/spec/features/expand_collapse_diffs_spec.rb
@@ -5,12 +5,12 @@ feature 'Expand and collapse diffs', js: true, feature: true do
before do
login_as :admin
- merge_request = create(:merge_request, target_branch: 'expand-collapse-diffs-start', source_branch: 'expand-collapse-diffs')
- project = merge_request.source_project
+ project = create(:project)
+ branch = 'expand-collapse-diffs'
# Ensure that undiffable.md is in .gitattributes
- project.repository.copy_gitattributes('expand-collapse-diffs')
- visit diffs_namespace_project_merge_request_path(project.namespace, project, merge_request)
+ project.repository.copy_gitattributes(branch)
+ visit namespace_project_commit_path(project.namespace, project, project.commit(branch))
execute_script('window.ajaxUris = []; $(document).ajaxSend(function(event, xhr, settings) { ajaxUris.push(settings.url) });')
end
@@ -30,7 +30,7 @@ feature 'Expand and collapse diffs', js: true, feature: true do
define_method(file.split('.').first) { file_container(file) }
end
- context 'visiting an existing merge request' do
+ context 'visiting a commit with collapsed diffs' do
it 'shows small diffs immediately' do
expect(small_diff).to have_selector('.code')
expect(small_diff).not_to have_selector('.nothing-here-block')
@@ -74,13 +74,13 @@ feature 'Expand and collapse diffs', js: true, feature: true do
it 'shows the old content' do
old_line = large_diff_renamed.find('.line_content.old')
- expect(old_line).to have_content('four copies')
+ expect(old_line).to have_content('two copies')
end
it 'shows the new content' do
new_line = large_diff_renamed.find('.line_content.new', match: :prefer_exact)
- expect(new_line).to have_content('six copies')
+ expect(new_line).to have_content('three copies')
end
end
diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb
index 311610c9911..bb6c84262f6 100644
--- a/spec/support/test_env.rb
+++ b/spec/support/test_env.rb
@@ -5,21 +5,20 @@ module TestEnv
# When developing the seed repository, comment out the branch you will modify.
BRANCH_SHA = {
- 'empty-branch' => '7efb185',
- 'flatten-dir' => 'e56497b',
- 'feature' => '0b4bc9a',
- 'feature_conflict' => 'bb5206f',
- 'fix' => '48f0be4',
- 'improve/awesome' => '5937ac0',
- 'markdown' => '0ed8c6c',
- 'lfs' => 'be93687',
- 'master' => '5937ac0',
- "'test'" => 'e56497b',
- 'orphaned-branch' => '45127a9',
- 'binary-encoding' => '7b1cf43',
- 'gitattributes' => '5a62481',
- 'expand-collapse-diffs-start' => '65b04e4',
- 'expand-collapse-diffs' => '865e6d5'
+ 'empty-branch' => '7efb185',
+ 'flatten-dir' => 'e56497b',
+ 'feature' => '0b4bc9a',
+ 'feature_conflict' => 'bb5206f',
+ 'fix' => '48f0be4',
+ 'improve/awesome' => '5937ac0',
+ 'markdown' => '0ed8c6c',
+ 'lfs' => 'be93687',
+ 'master' => '5937ac0',
+ "'test'" => 'e56497b',
+ 'orphaned-branch' => '45127a9',
+ 'binary-encoding' => '7b1cf43',
+ 'gitattributes' => '5a62481',
+ 'expand-collapse-diffs' => '4842455'
}
# gitlab-test-fork is a fork of gitlab-fork, but we don't necessarily
--
GitLab