Skip to content

Commit 212d337

Browse files
author
Dean Sofer
committed
fix(tests): Setting up tests
1 parent 9afc319 commit 212d337

File tree

3 files changed

+3
-7
lines changed

3 files changed

+3
-7
lines changed

src/ui-select2.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,7 @@
55
* This change is so that you do not have to do an additional query yourself on top of Select2's own query
66
* @params [options] {object} The configuration options passed to $.fn.select2(). Refer to the documentation
77
*/
8-
<<<<<<< HEAD:src/ui-select2.js
9-
angular.module('ui.select2', []).directive('uiSelect2', ['uiSelect2Config', '$timeout', function (uiSelect2Config, $timeout) {
10-
=======
11-
angular.module('ui.select2', []).directive('uiSelect2', ['ui.config', '$timeout', function (uiConfig, $timeout) {
12-
>>>>>>> 92733e3ba9527423adc5e7433cd6918590f04e65:select2.js
8+
angular.module('ui.select2', []).value('uiSelect2Config', {}).directive('uiSelect2', ['uiSelect2Config', '$timeout', function (uiSelect2Config, $timeout) {
139
var options = {};
1410
if (uiSelect2Config) {
1511
angular.extend(options, uiSelect2Config);
File renamed without changes.

tests/test.conf.js renamed to test/test.conf.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ files = [
77
'components/angular-mocks/angular-mocks.js',
88
'components/select2/select2.js',
99
'src/*.js',
10-
'tests/*.js'
10+
'test/*Spec.js'
1111
];
12-
runOnce = true;
12+
singleRun = true;

0 commit comments

Comments
 (0)