kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fixed bugs and added tests

This commit is contained in:
Luke "Jared" Bennett 2017-04-07 02:50:10 +01:00
parent bb4bc215f8
commit 907b754173
No known key found for this signature in database
GPG Key ID: 402ED51FB5D306C2
6 changed files with 33 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/droplab/drop_down.js
View File

@ -37,7 +37,7 @@ Object.assign(DropDown.prototype, {
clickEvent: function(e) {
if (e.target.tagName === 'UL') return;
var selected = utils.closest(e.target, 'LI', '');
var selected = utils.closest(e.target, 'LI');
if (!selected) return;
this.addSelectedClass(selected);

2
app/assets/javascripts/notes.js
View File

@ -143,7 +143,7 @@ require('./task_list');
form.querySelector('.js-comment-type-dropdown .dropdown-menu'),
form.querySelector('#note_type'),
form.querySelector('.js-comment-type-dropdown .js-comment-submit-button'),
form.querySelector('.js-note-target-close'),
form.querySelector('.js-note-target-close:not(.hidden)') || form.querySelector('.js-note-target-reopen'),
);
this.commentTypeToggle.initDroplab();

5
app/views/projects/notes/_comment_button.html.haml
View File

@ -1,4 +1,5 @@
- noteable_name = @note.noteable.human_class_name
- noteable_state_action = noteable_name =~ /(merge request|issue)/ && @note.noteable['state'] == 'closed' ? 'reopen' : 'close'
.pull-left.btn-group.append-right-10.comment-type-dropdown.js-comment-type-dropdown
%input.btn.btn-nr.btn-create.comment-btn.js-comment-button.js-comment-submit-button{ type: 'submit', value: 'Comment' }
@ -8,7 +9,7 @@
= icon('caret-down')
%ul#resolvable-comment-menu.dropdown-menu{ data: { dropdown: true } }
%li#comment.droplab-item-selected{ data: { value: '', 'button-text' => 'Comment', 'secondary-button-text' => "Comment & close #{noteable_name}" } }
%li#comment.droplab-item-selected{ data: { value: '', 'button-text' => 'Comment', 'secondary-button-text' => "Comment & #{noteable_state_action} #{noteable_name}" } }
= icon('check')
.description
%strong Comment
@ -17,7 +18,7 @@
%li.divider
%li#discussion{ data: { value: 'DiscussionNote', 'button-text' => 'Start discussion', 'secondary-button-text' => "Start discussion & close #{noteable_name}" } }
%li#discussion{ data: { value: 'DiscussionNote', 'button-text' => 'Start discussion', 'secondary-button-text' => "Start discussion & #{noteable_state_action} #{noteable_name}" } }
= icon('check')
.description
%strong Start discussion

20
spec/features/discussion_comments_spec.rb
View File

@ -93,9 +93,9 @@ shared_examples 'discussion comments' do |resource_name|
end
it 'clicking the ul padding should not change the text' do
find(menu_selector).click
find(menu_selector).trigger 'click'
expect(find(submit_selector)).to have_content 'Comment'
expect(find(dropdown_selector)).to have_content 'Comment'
end
describe 'when selecting "Start discussion"' do
@ -109,7 +109,7 @@ shared_examples 'discussion comments' do |resource_name|
end
it 'updates the submit button text' do
expect(find(dropdown_selector)).to have_content "Start discussion"
expect(find(dropdown_selector)).to have_content 'Start discussion'
end
if resource_name =~ /(issue|merge request)/
@ -181,7 +181,7 @@ shared_examples 'discussion comments' do |resource_name|
end
it 'updates the submit button text' do
expect(find(dropdown_selector)).to have_content "Comment"
expect(find(dropdown_selector)).to have_content 'Comment'
end
if resource_name =~ /(issue|merge request)/
@ -222,20 +222,22 @@ shared_examples 'discussion comments' do |resource_name|
if resource_name =~ /(issue|merge request)/
describe "on a closed #{resource_name}" do
before do
find("#{form_selector} .close-mr-link").click
find("#{form_selector} .js-note-target-close").click
find("#{form_selector} .note-textarea").send_keys('a')
end
it 'should show a "Comment & reopen #{resource_name}" button' do
expect(find(close_selector)).to have_content "Comment & reopen #{resource_name}"
it "should show a 'Comment & reopen #{resource_name}' button" do
expect(find("#{form_selector} .js-note-target-reopen")).to have_content "Comment & reopen #{resource_name}"
end
it 'should show a "Start discussion & reopen #{resource_name}" button when "Start discussion" is selected' do
it "should show a 'Start discussion & reopen #{resource_name}' button when 'Start discussion' is selected" do
find(toggle_selector).click
find("#{menu_selector} li", match: :first)
all("#{menu_selector} li").last.click
expect(find(close_selector)).to have_content "Start discussion & reopen #{resource_name}"
expect(find("#{form_selector} .js-note-target-reopen")).to have_content "Start discussion & reopen #{resource_name}"
end
end
end

17
spec/javascripts/droplab/drop_down_spec.js
View File

@ -130,7 +130,7 @@ describe('DropDown', function () {
beforeEach(function () {
this.list = { dispatchEvent: () => {} };
this.dropdown = { hide: () => {}, list: this.list, addSelectedClass: () => {} };
this.event = { preventDefault: () => {}, target: 'target' };
this.event = { preventDefault: () => {}, target: {} };
this.customEvent = {};
this.closestElement = {};
@ -168,6 +168,21 @@ describe('DropDown', function () {
expect(this.list.dispatchEvent).toHaveBeenCalledWith(this.customEvent);
});
describe('if the target is a UL element', function () {
beforeEach(function () {
this.event = { preventDefault: () => {}, target: { tagName: 'UL' } };
spyOn(this.event, 'preventDefault');
utils.closest.calls.reset();
DropDown.prototype.clickEvent.call(this.dropdown, this.event);
});
it('should return immediately', function () {
expect(utils.closest).not.toHaveBeenCalled();
});
});
describe('if no selected element exists', function () {
beforeEach(function () {
this.event.preventDefault.calls.reset();

2
spec/javascripts/droplab/plugins/input_setter_spec.js
View File

@ -2,7 +2,7 @@
import InputSetter from '~/droplab/plugins/input_setter';
fdescribe('InputSetter', function () {
describe('InputSetter', function () {
describe('init', function () {
beforeEach(function () {
this.config = { InputSetter: {} };