Fix tests that failed after merging master

Also, fix rubocop issues
This commit is contained in:
Maciej Szlosarczyk 2018-08-24 13:17:08 +03:00
parent 0dc0ac4d16
commit c92fc25683
No known key found for this signature in database
GPG key ID: 41D62D42D3B0D765
4 changed files with 28 additions and 16 deletions

View file

@ -77,7 +77,7 @@ class DomainPresenter
def schedule_force_delete_btn
view.content_tag(:a, view.t('admin.domains.force_delete_toggle_btn.schedule'),
class: 'btn btn-default',
class: 'dropdown-item',
data: {
toggle: 'modal',
target: '.domain-edit-force-delete-dialog',
@ -91,14 +91,14 @@ class DomainPresenter
data: {
confirm: view.t('admin.domains.force_delete_toggle_btn.cancel_confirm'),
},
class: 'btn btn-primary'
class: 'dropdown-item'
end
def inactive_schedule_force_delete_btn
view.content_tag :button, view.t('admin.domains.force_delete_toggle_btn.schedule'),
title: view.t('admin.domains.force_delete_toggle_btn.unable_to_schedule'),
disabled: true,
class: 'btn btn-default'
class: 'dropdown-item'
end
attr_reader :domain