Commit 08debbbe authored by Justin Ho's avatar Justin Ho

Update UI and qa specs after feedback

- Fix table cell breaking into 2 lines
- Refactor and rename qa selector to simpify code
parent c764142c
......@@ -137,6 +137,12 @@
}
}
.d-sm-table-cell {
@include media-breakpoint-up(sm) {
display: table-cell !important;
}
}
.gl-white-space-normal { @include gl-white-space-normal; }
.gl-word-break-all { @include gl-word-break-all; }
.gl-reset-line-height { @include gl-reset-line-height; }
......
......@@ -3,7 +3,7 @@
%col
%col
%col.d-none.d-sm-table-column
%col{ width: 120 }
%col{ width: 130 }
%thead{ role: 'rowgroup' }
%tr{ role: 'row' }
%th{ role: 'columnheader', scope: 'col', 'aria-colindex': 1 }
......@@ -18,9 +18,9 @@
%td{ role: 'cell', 'aria-colindex': 1, 'aria-label': activated_label }
= boolean_to_icon integration.activated?
%td{ role: 'cell', 'aria-colindex': 2 }
= link_to scoped_edit_integration_path(integration), { data: { qa_selector: "#{integration.title.downcase.gsub(/[\s\(\)]/,'_')}_link" } } do
= link_to scoped_edit_integration_path(integration), { data: { qa_selector: "#{integration.to_param}_link" } } do
%strong= integration.title
%td.d-none.d-sm-block{ role: 'cell', 'aria-colindex': 3 }
%td.d-none.d-sm-table-cell{ role: 'cell', 'aria-colindex': 3 }
= integration.description
%td{ role: 'cell', 'aria-colindex': 4 }
- if integration.updated_at.present?
......
......@@ -7,11 +7,11 @@ module QA
module Settings
class Integrations < QA::Page::Base
view 'app/views/shared/integrations/_integrations.html.haml' do
element :jenkins_ci_link, '{ data: { qa_selector: "#{integration.title.downcase.gsub' # rubocop:disable QA/ElementWithPattern
element :jenkins_link, '{ data: { qa_selector: "#{integration.to_param' # rubocop:disable QA/ElementWithPattern
end
def click_jenkins_ci_link
click_element :jenkins_ci_link
click_element :jenkins_link
end
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