Commit 0767861b authored by James Lopez's avatar James Lopez

refactor code based on feedback

parent 228b757d
...@@ -16,13 +16,13 @@ module BlobHelper ...@@ -16,13 +16,13 @@ module BlobHelper
options[:link_opts]) options[:link_opts])
end end
def edit_blob_element(project = @project, ref = @ref, path = @path, options = {}) def edit_blob_button(project = @project, ref = @ref, path = @path, options = {})
return unless blob = readable_blob(options, path, project, ref) return unless blob = readable_blob(options, path, project, ref)
common_classes = "btn js-edit-blob #{options[:extra_class]}" common_classes = "btn js-edit-blob #{options[:extra_class]}"
if !on_top_of_branch?(project, ref) if !on_top_of_branch?(project, ref)
edit_button_tag(edit_text, common_classes) edit_disabled_button_tag(edit_text, common_classes)
# This condition applies to anonymous or users who can edit directly # This condition applies to anonymous or users who can edit directly
elsif !current_user || user_can_modify_blob?(blob, project, ref) elsif !current_user || user_can_modify_blob?(blob, project, ref)
edit_link_tag(edit_text, edit_blob_path(project, ref, path, options), common_classes) edit_link_tag(edit_text, edit_blob_path(project, ref, path, options), common_classes)
...@@ -54,14 +54,14 @@ module BlobHelper ...@@ -54,14 +54,14 @@ module BlobHelper
_('Web IDE') _('Web IDE')
end end
def ide_edit_element(project = @project, ref = @ref, path = @path, options = {}) def ide_edit_button(project = @project, ref = @ref, path = @path, options = {})
return unless show_new_ide? return unless show_new_ide?
return unless blob = readable_blob(options, path, project, ref) return unless blob = readable_blob(options, path, project, ref)
common_classes = "btn js-edit-ide #{options[:extra_class]}" common_classes = "btn js-edit-ide #{options[:extra_class]}"
if !on_top_of_branch?(project, ref) if !on_top_of_branch?(project, ref)
edit_button_tag(ide_edit_text, common_classes) edit_disabled_button_tag(ide_edit_text, common_classes)
# This condition only applies to users who are logged in # This condition only applies to users who are logged in
# Web IDE (Beta) requires the user to have this feature enabled # Web IDE (Beta) requires the user to have this feature enabled
elsif user_can_modify_blob?(blob, project, ref) elsif user_can_modify_blob?(blob, project, ref)
...@@ -327,17 +327,17 @@ module BlobHelper ...@@ -327,17 +327,17 @@ module BlobHelper
def edit_blob_fork_params(path) def edit_blob_fork_params(path)
{ {
to: path, to: path,
notice: edit_in_new_fork_notice, notice: edit_in_new_fork_notice,
notice_now: edit_in_new_fork_notice_now notice_now: edit_in_new_fork_notice_now
} }
end end
def edit_modify_file_fork_params(action) def edit_modify_file_fork_params(action)
{ {
to: request.fullpath, to: request.fullpath,
notice: edit_in_new_fork_notice_action(action), notice: edit_in_new_fork_notice_action(action),
notice_now: edit_in_new_fork_notice_now notice_now: edit_in_new_fork_notice_now
} }
end end
...@@ -349,7 +349,7 @@ module BlobHelper ...@@ -349,7 +349,7 @@ module BlobHelper
data: { action: action, fork_path: fork_path } data: { action: action, fork_path: fork_path }
end end
def edit_button_tag(button_text, common_classes) def edit_disabled_button_tag(button_text, common_classes)
button_tag(button_text, class: "#{common_classes} disabled has-tooltip", title: _('You can only edit files when you are on a branch'), data: { container: 'body' }) button_tag(button_text, class: "#{common_classes} disabled has-tooltip", title: _('You can only edit files when you are on a branch'), data: { container: 'body' })
end end
......
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
= view_on_environment_button(@commit.sha, @path, @environment) if @environment = view_on_environment_button(@commit.sha, @path, @environment) if @environment
.btn-group{ role: "group" }< .btn-group{ role: "group" }<
= edit_blob_element = edit_blob_button
= ide_edit_element = ide_edit_button
- if current_user - if current_user
= replace_blob_link = replace_blob_link
= delete_blob_link = delete_blob_link
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
\ \
- if editable_diff?(diff_file) - if editable_diff?(diff_file)
- link_opts = @merge_request.persisted? ? { from_merge_request_iid: @merge_request.iid } : {} - link_opts = @merge_request.persisted? ? { from_merge_request_iid: @merge_request.iid } : {}
= edit_blob_element(@merge_request.source_project, @merge_request.source_branch, diff_file.new_path, = edit_blob_button(@merge_request.source_project, @merge_request.source_branch, diff_file.new_path,
blob: blob, link_opts: link_opts) blob: blob, link_opts: link_opts)
- if image_diff && image_replaced - if image_diff && image_replaced
......
...@@ -86,7 +86,7 @@ describe BlobHelper do ...@@ -86,7 +86,7 @@ describe BlobHelper do
it 'verifies blob is text' do it 'verifies blob is text' do
expect(helper).not_to receive(:blob_text_viewable?) expect(helper).not_to receive(:blob_text_viewable?)
button = edit_blob_element(project, 'refs/heads/master', 'README.md') button = edit_blob_button(project, 'refs/heads/master', 'README.md')
expect(button).to start_with('<button') expect(button).to start_with('<button')
end end
...@@ -96,17 +96,17 @@ describe BlobHelper do ...@@ -96,17 +96,17 @@ describe BlobHelper do
expect(project.repository).not_to receive(:blob_at) expect(project.repository).not_to receive(:blob_at)
edit_blob_element(project, 'refs/heads/master', 'README.md', blob: blob) edit_blob_button(project, 'refs/heads/master', 'README.md', blob: blob)
end end
it 'returns a link with the proper route' do it 'returns a link with the proper route' do
link = edit_blob_element(project, 'master', 'README.md') link = edit_blob_button(project, 'master', 'README.md')
expect(Capybara.string(link).find_link('Edit')[:href]).to eq("/#{project.full_path}/edit/master/README.md") expect(Capybara.string(link).find_link('Edit')[:href]).to eq("/#{project.full_path}/edit/master/README.md")
end end
it 'returns a link with the passed link_opts on the expected route' do it 'returns a link with the passed link_opts on the expected route' do
link = edit_blob_element(project, 'master', 'README.md', link_opts: { mr_id: 10 }) link = edit_blob_button(project, 'master', 'README.md', link_opts: { mr_id: 10 })
expect(Capybara.string(link).find_link('Edit')[:href]).to eq("/#{project.full_path}/edit/master/README.md?mr_id=10") expect(Capybara.string(link).find_link('Edit')[:href]).to eq("/#{project.full_path}/edit/master/README.md?mr_id=10")
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