Fix a wrong "The build for this merge request failed" message

Also allow merge request to be merged with skipped pipeline and the
"only allow merge when pipeline is green" feature enabled

Signed-off-by: Rémy Coutable <remy@rymai.me>

1 files changed, 22 insertions, 0 deletions

diff --git a/spec/features/merge_requests/toggle_whitespace_changes_spec.rb b/spec/features/merge_requests/toggle_whitespace_changes_spec.rb
new file mode 100644
index 00000000000..0f98737b700
--- /dev/null
+++ b/spec/features/merge_requests/toggle_whitespace_changes_spec.rb
@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+feature 'Toggle Whitespace Changes', js: true, feature: true do
+  before do
+    login_as :admin
+    merge_request = create(:merge_request)
+    project = merge_request.source_project
+    visit diffs_namespace_project_merge_request_path(project.namespace, project, merge_request)
+  end
+
+  it 'has a button to toggle whitespace changes' do
+    expect(page).to have_content 'Hide whitespace changes'
+  end
+
+  describe 'clicking "Hide whitespace changes" button' do
+    it 'toggles the "Hide whitespace changes" button' do
+      click_link 'Hide whitespace changes'
+
+      expect(page).to have_content 'Show whitespace changes'
+    end
+  end
+end