`None` for assignees
Update assignees_spec.js Update sidebar_spec.rb Update issues_spec.rb
This commit is contained in:
parent
232a8f75bb
commit
79086edeef
|
@ -153,7 +153,7 @@ export default {
|
|||
data-placement="left"
|
||||
data-boundary="viewport"
|
||||
>
|
||||
<i v-if="hasNoUsers" aria-label="No Assignee" class="fa fa-user"> </i>
|
||||
<i v-if="hasNoUsers" aria-label="None" class="fa fa-user"> </i>
|
||||
<button
|
||||
v-for="(user, index) in users"
|
||||
v-if="shouldRenderCollapsedAssignee(index)"
|
||||
|
@ -185,7 +185,7 @@ export default {
|
|||
</span>
|
||||
<template v-if="hasNoUsers">
|
||||
<span class="assign-yourself no-value">
|
||||
No assignee
|
||||
None
|
||||
<template v-if="editable">
|
||||
- <button type="button" class="btn-link" @click="assignSelf">assign yourself</button>
|
||||
</template>
|
||||
|
|
|
@ -133,7 +133,7 @@ describe 'Issue Boards', :js do
|
|||
close_dropdown_menu_if_visible
|
||||
wait_for_requests
|
||||
|
||||
expect(page).to have_content('No assignee')
|
||||
expect(page).to have_content('None')
|
||||
end
|
||||
|
||||
expect(card_two).not_to have_selector('.avatar')
|
||||
|
@ -143,7 +143,7 @@ describe 'Issue Boards', :js do
|
|||
click_card(card)
|
||||
|
||||
page.within(find('.assignee')) do
|
||||
expect(page).to have_content('No assignee')
|
||||
expect(page).to have_content('None')
|
||||
|
||||
click_button 'assign yourself'
|
||||
|
||||
|
|
|
@ -91,7 +91,7 @@ describe 'Issues' do
|
|||
click_button 'Save changes'
|
||||
|
||||
page.within('.assignee') do
|
||||
expect(page).to have_content 'No assignee - assign yourself'
|
||||
expect(page).to have_content 'None - assign yourself'
|
||||
end
|
||||
|
||||
expect(issue.reload.assignees).to be_empty
|
||||
|
@ -465,7 +465,7 @@ describe 'Issues' do
|
|||
click_link 'Edit'
|
||||
click_link 'Unassigned'
|
||||
first('.title').click
|
||||
expect(page).to have_content 'No assignee'
|
||||
expect(page).to have_content 'None'
|
||||
end
|
||||
|
||||
# wait_for_requests does not work with vue-resource at the moment
|
||||
|
@ -479,7 +479,7 @@ describe 'Issues' do
|
|||
visit project_issue_path(project, issue2)
|
||||
|
||||
page.within('.assignee') do
|
||||
expect(page).to have_content "No assignee"
|
||||
expect(page).to have_content "None"
|
||||
end
|
||||
|
||||
page.within '.assignee' do
|
||||
|
@ -522,7 +522,7 @@ describe 'Issues' do
|
|||
close_dropdown_menu_if_visible
|
||||
|
||||
page.within '.value .assign-yourself' do
|
||||
expect(page).to have_content "No assignee"
|
||||
expect(page).to have_content "None"
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -24,12 +24,12 @@ describe('Assignee component', () => {
|
|||
const collapsed = component.$el.querySelector('.sidebar-collapsed-icon');
|
||||
|
||||
expect(collapsed.childElementCount).toEqual(1);
|
||||
expect(collapsed.children[0].getAttribute('aria-label')).toEqual('No Assignee');
|
||||
expect(collapsed.children[0].getAttribute('aria-label')).toEqual('None');
|
||||
expect(collapsed.children[0].classList.contains('fa')).toEqual(true);
|
||||
expect(collapsed.children[0].classList.contains('fa-user')).toEqual(true);
|
||||
});
|
||||
|
||||
it('displays only "No assignee" when no users are assigned and the issue is read-only', () => {
|
||||
it('displays only "None" when no users are assigned and the issue is read-only', () => {
|
||||
component = new AssigneeComponent({
|
||||
propsData: {
|
||||
rootPath: 'http://localhost:3000',
|
||||
|
@ -39,11 +39,11 @@ describe('Assignee component', () => {
|
|||
}).$mount();
|
||||
const componentTextNoUsers = component.$el.querySelector('.assign-yourself').innerText.trim();
|
||||
|
||||
expect(componentTextNoUsers).toBe('No assignee');
|
||||
expect(componentTextNoUsers).toBe('None');
|
||||
expect(componentTextNoUsers.indexOf('assign yourself')).toEqual(-1);
|
||||
});
|
||||
|
||||
it('displays only "No assignee" when no users are assigned and the issue can be edited', () => {
|
||||
it('displays only "None" when no users are assigned and the issue can be edited', () => {
|
||||
component = new AssigneeComponent({
|
||||
propsData: {
|
||||
rootPath: 'http://localhost:3000',
|
||||
|
@ -53,7 +53,7 @@ describe('Assignee component', () => {
|
|||
}).$mount();
|
||||
const componentTextNoUsers = component.$el.querySelector('.assign-yourself').innerText.trim();
|
||||
|
||||
expect(componentTextNoUsers.indexOf('No assignee')).toEqual(0);
|
||||
expect(componentTextNoUsers.indexOf('None')).toEqual(0);
|
||||
expect(componentTextNoUsers.indexOf('assign yourself')).toBeGreaterThan(0);
|
||||
});
|
||||
|
||||
|
|
Loading…
Reference in New Issue