Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Rewrote maximumSelectionLength tests to use container These brings the tests in line with other tests which we have, and makes it easier to understand what is actually going on in the tests. This also removes a redundant set of tests where we were testing with => 2 options being allowed. There are no current edge cases that would have required this. * Fix maximumSelectionLength being ignored by closeOnSelect There was a bug where the `maximumSelectionLength` option would not kick in if the `closeOnSelect` option was enabled. Normally, this was enabled by someone in their global configuration, but it could also be seen when somoene selected an option while holding the meta/ctrl/alt keys. This would implicitly enable the `closeOnSelect` behaviour, even when it was not globally enabled, and cause the bug. This fixes that issue by listening to the `select` event which is triggered whenever an option is selected, and triggers the "maximum selected" message based on that event. This should now force the message to be displayed, even when the results did not have to be queried another time. Fixes #3514 Fixes #3860 Closes #5333
- Loading branch information
1 parent
f2d527e
commit 2fce8ae
Showing
2 changed files
with
94 additions
and
121 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,202 +1,152 @@ | ||
module('Data adapters - Maximum selection length'); | ||
|
||
var SelectData = require('select2/data/select'); | ||
var MaximumSelectionLength = require('select2/data/maximumSelectionLength'); | ||
|
||
var $ = require('jquery'); | ||
var Options = require('select2/options'); | ||
var Utils = require('select2/utils'); | ||
|
||
function MaximumSelectionStub () { | ||
this.called = false; | ||
this.currentData = []; | ||
} | ||
var MaximumSelectionData = Utils.Decorate(SelectData, MaximumSelectionLength); | ||
|
||
MaximumSelectionStub.prototype.current = function (callback) { | ||
callback(this.currentData); | ||
}; | ||
|
||
MaximumSelectionStub.prototype.val = function (val) { | ||
this.currentData.push(val); | ||
}; | ||
|
||
MaximumSelectionStub.prototype.query = function (params, callback) { | ||
this.called = true; | ||
}; | ||
test('0 never displays the notice', function (assert) { | ||
assert.expect(3); | ||
|
||
var MaximumSelectionData = Utils.Decorate( | ||
MaximumSelectionStub, | ||
MaximumSelectionLength | ||
); | ||
var $select = $('#qunit-fixture .multiple'); | ||
|
||
test('0 never displays the notice', function (assert) { | ||
var zeroOptions = new Options({ | ||
maximumSelectionLength: 0 | ||
}); | ||
|
||
var data = new MaximumSelectionData(null, zeroOptions); | ||
var container = new MockContainer(); | ||
var data = new MaximumSelectionData($select, zeroOptions); | ||
|
||
data.trigger = function () { | ||
assert.ok(false, 'No events should be triggered'); | ||
}; | ||
data.bind(container, null); | ||
|
||
data.on('results:message', function () { | ||
assert.ok(false, 'The message should not be displayed'); | ||
}); | ||
|
||
data.query({ | ||
term: '' | ||
}, function () { | ||
assert.ok(true, 'The results should be queried'); | ||
}); | ||
|
||
assert.ok(data.called); | ||
|
||
data = new MaximumSelectionData(null, zeroOptions); | ||
|
||
data.trigger = function () { | ||
assert.ok(false, 'No events should be triggered'); | ||
}; | ||
|
||
data.val('1'); | ||
$select.val(['One']); | ||
|
||
data.query({ | ||
term: '' | ||
}, function () { | ||
assert.ok(true, 'The results should be queried'); | ||
}); | ||
|
||
assert.ok(data.called); | ||
|
||
data = new MaximumSelectionData(null, zeroOptions); | ||
|
||
data.trigger = function () { | ||
assert.ok(false, 'No events should be triggered'); | ||
}; | ||
|
||
data.val('1'); | ||
data.val('2'); | ||
$select.val(['One', 'Two']); | ||
|
||
data.query({ | ||
term: '' | ||
}, function () { | ||
assert.ok(true, 'The results should be queried'); | ||
}); | ||
|
||
assert.ok(data.called); | ||
}); | ||
|
||
test('< 0 never displays the notice', function (assert) { | ||
assert.expect(3); | ||
|
||
var $select = $('#qunit-fixture .multiple'); | ||
|
||
var negativeOptions = new Options({ | ||
maximumSelectionLength: -1 | ||
}); | ||
|
||
var data = new MaximumSelectionData(null, negativeOptions); | ||
var container = new MockContainer(); | ||
var data = new MaximumSelectionData($select, negativeOptions); | ||
|
||
data.bind(container, null); | ||
|
||
data.trigger = function () { | ||
assert.ok(false, 'No events should be triggered'); | ||
}; | ||
data.on('results:message', function () { | ||
assert.ok(false, 'The message should not be displayed'); | ||
}); | ||
|
||
data.query({ | ||
term: '' | ||
}, function () { | ||
assert.ok(true, 'The results should be queried'); | ||
}); | ||
|
||
assert.ok(data.called); | ||
|
||
data = new MaximumSelectionData(null, negativeOptions); | ||
|
||
data.trigger = function () { | ||
assert.ok(false, 'No events should be triggered'); | ||
}; | ||
|
||
data.val('1'); | ||
$select.val(['One']); | ||
|
||
data.query({ | ||
term: '' | ||
}, function () { | ||
assert.ok(true, 'The results should be queried'); | ||
}); | ||
|
||
assert.ok(data.called); | ||
|
||
data = new MaximumSelectionData(null, negativeOptions); | ||
|
||
data.trigger = function () { | ||
assert.ok(false, 'No events should be triggered'); | ||
}; | ||
|
||
data.val('1'); | ||
data.val('2'); | ||
$select.val(['One', 'Two']); | ||
|
||
data.query({ | ||
term: '' | ||
}, function () { | ||
assert.ok(true, 'The results should be queried'); | ||
}); | ||
|
||
assert.ok(data.called); | ||
}); | ||
|
||
test('triggers when >= 1 selection' , function (assert) { | ||
var maxOfOneOptions = new Options({ | ||
maximumSelectionLength: 1 | ||
}); | ||
var data = new MaximumSelectionData(null, maxOfOneOptions); | ||
assert.expect(2); | ||
|
||
data.trigger = function () { | ||
assert.ok(false, 'No events should be triggered'); | ||
}; | ||
var $select = $('#qunit-fixture .multiple'); | ||
|
||
data.query({ | ||
term: '' | ||
var maxOfOneOptions = new Options({ | ||
maximumSelectionLength: 1 | ||
}); | ||
|
||
assert.ok(data.called); | ||
var container = new MockContainer(); | ||
var data = new MaximumSelectionData($select, maxOfOneOptions); | ||
|
||
data = new MaximumSelectionData(null, maxOfOneOptions); | ||
data.bind(container, null); | ||
|
||
data.trigger = function () { | ||
assert.ok(true, 'The event should be triggered.'); | ||
}; | ||
data.on('results:message', function () { | ||
assert.ok(true, 'The message should be displayed'); | ||
}); | ||
|
||
data.val('1'); | ||
$select.val(['One']); | ||
|
||
data.query({ | ||
term: '' | ||
}, function () { | ||
assert.ok(false, 'The results should not be queried'); | ||
}); | ||
|
||
assert.ok(!data.called); | ||
|
||
}); | ||
|
||
test('triggers when >= 2 selections' , function (assert) { | ||
var maxOfTwoOptions = new Options({ | ||
maximumSelectionLength: 2 | ||
}); | ||
var data = new MaximumSelectionData(null, maxOfTwoOptions); | ||
|
||
data.trigger = function () { | ||
assert.ok(false, 'No events should be triggered'); | ||
}; | ||
$select.val(['One', 'Two']); | ||
|
||
data.query({ | ||
term: '' | ||
}, function () { | ||
assert.ok(false, 'The results should not be queried'); | ||
}); | ||
}); | ||
|
||
assert.ok(data.called); | ||
|
||
data = new MaximumSelectionData(null, maxOfTwoOptions); | ||
|
||
data.trigger = function () { | ||
assert.ok(false, 'No events should be triggered'); | ||
}; | ||
test('triggers after selection' , function (assert) { | ||
assert.expect(1); | ||
|
||
data.val('1'); | ||
var $select = $('#qunit-fixture .multiple'); | ||
|
||
data.query({ | ||
term: '' | ||
var maxOfOneOptions = new Options({ | ||
maximumSelectionLength: 1 | ||
}); | ||
|
||
assert.ok(data.called); | ||
|
||
data = new MaximumSelectionData(null, maxOfTwoOptions); | ||
|
||
data.trigger = function () { | ||
assert.ok(true, 'The event should be triggered.'); | ||
}; | ||
var container = new MockContainer(); | ||
var data = new MaximumSelectionData($select, maxOfOneOptions); | ||
|
||
data.val('1'); | ||
data.val('2'); | ||
data.bind(container, null); | ||
|
||
data.query({ | ||
term: '' | ||
data.on('results:message', function () { | ||
assert.ok(true, 'The message should be displayed'); | ||
}); | ||
|
||
assert.ok(!data.called); | ||
$select.val(['One']); | ||
|
||
container.trigger('select', { | ||
data: {} | ||
}); | ||
}); |