Commit cf01719d authored by Annabel Gray's avatar Annabel Gray Committed by Clement Ho

Resolve ""Click to expand" link in collapsed diffs should be blue"

parent 941cf7c3
...@@ -11,7 +11,7 @@ import syntaxHighlight from './syntax_highlight'; ...@@ -11,7 +11,7 @@ import syntaxHighlight from './syntax_highlight';
const WRAPPER = '<div class="diff-content"></div>'; const WRAPPER = '<div class="diff-content"></div>';
const LOADING_HTML = '<i class="fa fa-spinner fa-spin"></i>'; const LOADING_HTML = '<i class="fa fa-spinner fa-spin"></i>';
const ERROR_HTML = '<div class="nothing-here-block"><i class="fa fa-warning"></i> Could not load diff</div>'; const ERROR_HTML = '<div class="nothing-here-block"><i class="fa fa-warning"></i> Could not load diff</div>';
const COLLAPSED_HTML = '<div class="nothing-here-block diff-collapsed">This diff is collapsed. <a class="click-to-expand">Click to expand it.</a></div>'; const COLLAPSED_HTML = '<div class="nothing-here-block diff-collapsed">This diff is collapsed. <button class="click-to-expand btn btn-link">Click to expand it.</button></div>';
export default class SingleFileDiff { export default class SingleFileDiff {
constructor(file) { constructor(file) {
......
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
.click-to-expand { .click-to-expand {
cursor: pointer; cursor: pointer;
vertical-align: initial;
} }
} }
} }
......
...@@ -2,4 +2,4 @@ ...@@ -2,4 +2,4 @@
- url = url_for(safe_params.merge(action: :diff_for_path, old_path: diff_file.old_path, new_path: diff_file.new_path, file_identifier: diff_file.file_identifier)) - url = url_for(safe_params.merge(action: :diff_for_path, old_path: diff_file.old_path, new_path: diff_file.new_path, file_identifier: diff_file.file_identifier))
.nothing-here-block.diff-collapsed{ data: { diff_for_path: url } } .nothing-here-block.diff-collapsed{ data: { diff_for_path: url } }
This diff is collapsed. This diff is collapsed.
%a.click-to-expand Click to expand it. %button.click-to-expand.btn.btn-link Click to expand it.
...@@ -166,8 +166,7 @@ feature 'Diff file viewer', :js do ...@@ -166,8 +166,7 @@ feature 'Diff file viewer', :js do
context 'expanding the diff' do context 'expanding the diff' do
before do before do
# We can't use `click_link` because the "link" doesn't have an `href`. click_button 'Click to expand it.'
find('a.click-to-expand').click
wait_for_requests wait_for_requests
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment