Skip to content

Commit 5854615

Browse files
committed
updating some and adding new editor tests
1 parent 9c30fc0 commit 5854615

File tree

3 files changed

+62
-14
lines changed

3 files changed

+62
-14
lines changed

test/app/index.html

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,14 @@
1010
<link type="text/css" href="//cdn-na.infragistics.com/igniteui/latest/css/structure/modules/infragistics.ui.grid.css" rel="stylesheet" />
1111
<link type="text/css" href="//cdn-na.infragistics.com/igniteui/latest/css/structure/modules/infragistics.ui.editors.css" rel="stylesheet" />
1212
<link type="text/css" href="//cdn-na.infragistics.com/igniteui/latest/css/structure/modules/infragistics.ui.tree.css" rel="stylesheet" />
13+
<link type="text/css" href="//cdn-na.infragistics.com/igniteui/latest/css/structure/modules/infragistics.ui.popover.css" rel="stylesheet" />
1314
<link type="text/css" href="//cdn-na.infragistics.com/igniteui/latest/css/structure/modules/infragistics.ui.validator.css" rel="stylesheet" />
1415
<link type="text/css" href="//cdn-na.infragistics.com/igniteui/latest/css/structure/modules/infragistics.ui.combo.css" rel="stylesheet" />
16+
<link type="text/css" href="//cdn-na.infragistics.com/igniteui/latest/css/structure/modules/infragistics.ui.htmleditor.css" rel="stylesheet" />
17+
<link type="text/css" href="//cdn-na.infragistics.com/igniteui/latest/css/structure/modules/infragistics.ui.toolbar.css" rel="stylesheet" />
18+
<link type="text/css" href="//cdn-na.infragistics.com/igniteui/latest/css/structure/modules/infragistics.ui.toolbarbutton.css" rel="stylesheet" />
19+
<link type="text/css" href="//cdn-na.infragistics.com/igniteui/latest/css/structure/modules/infragistics.ui.splitbutton.css" rel="stylesheet" />
20+
<link type="text/css" href="//cdn-na.infragistics.com/igniteui/latest/css/structure/modules/infragistics.ui.colorpicker.css" rel="stylesheet" />
1521

1622
</head>
1723

@@ -101,36 +107,39 @@ <h1>igCombo</h1>
101107
</li>
102108
</ul>
103109

110+
<ig-html-editor id="htmlEditor1" event-action-executed="triggerEvent">
111+
</ig-html-editor>
112+
104113
<h1>igEditors</h1>
105114
<table id="igEditors">
106115
<tbody>
107116
<tr>
108117
<td>igCurrencyEditor</td>
109-
<td><ig-currency-editor id="currency1" ng-model="editors.currency"></ig-currency-editor></td>
118+
<td><ig-currency-editor id="currency1" ng-model="editors.currency" event-mouseover="triggerEvent"></ig-currency-editor></td>
110119
</tr>
111120
<tr>
112121
<td>igDateEditor</td>
113-
<td><ig-date-editor id="date1" ng-model="editors.date"></ig-date-editor></td>
122+
<td><ig-date-editor id="date1" ng-model="editors.date" event-mouseover="triggerEvent"></ig-date-editor></td>
114123
</tr>
115124
<tr>
116125
<td>igMaskEditor</td>
117-
<td><ig-mask-editor id="mask1" ng-model="editors.mask" input-mask="999-999-999"></ig-mask-editor></td>
126+
<td><ig-mask-editor id="mask1" ng-model="editors.mask" input-mask="999-999-999" event-mouseover="triggerEvent"></ig-mask-editor></td>
118127
</tr>
119128
<tr>
120129
<td>igNumericEditor</td>
121-
<td><ig-numeric-editor id="numeric1" ng-model="editors.currency"></ig-numeric-editor></td>
130+
<td><ig-numeric-editor id="numeric1" ng-model="editors.currency" event-mouseover="triggerEvent"></ig-numeric-editor></td>
122131
</tr>
123132
<tr>
124133
<td>igPercentEditor</td>
125-
<td><ig-percent-editor id="percent1" ng-model="editors.percent"></ig-percent-editor></td>
134+
<td><ig-percent-editor id="percent1" ng-model="editors.percent" event-mouseover="triggerEvent"></ig-percent-editor></td>
126135
</tr>
127136
<tr>
128137
<td>igTextEditor</td>
129-
<td><ig-text-editor id="text1" ng-model="editors.text"></ig-text-editor></td>
138+
<td><ig-text-editor id="text1" ng-model="editors.text" event-mouseover="triggerEvent"></ig-text-editor></td>
130139
</tr>
131140
<tr>
132141
<td>igDatePicker</td>
133-
<td><ig-date-picker id="datePicker1" ng-model="editors.date"></ig-date-picker></td>
142+
<td><ig-date-picker id="datePicker1" ng-model="editors.date" event-mouseover="triggerEvent"></ig-date-picker></td>
134143
</tr>
135144
</tbody>
136145
</table>
@@ -161,7 +170,13 @@ <h1>igEditors</h1>
161170
<script type="text/javascript" src="//cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.templating.js"></script>
162171
<script type="text/javascript" src="//cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.ui.tree.js"></script>
163172
<script type="text/javascript" src="//cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.ui.combo.js"></script>
164-
<script type="text/javascript" src="//cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.ui.validator.js"></script>
173+
<script type="text/javascript" src="//cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.ui.validator.js"></script>
174+
<script type="text/javascript" src="//cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.ui.toolbarbutton.js"></script>
175+
<script type="text/javascript" src="//cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.ui.toolbar.js"></script>
176+
<script type="text/javascript" src="//cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.ui.splitbutton.js"></script>
177+
<script type="text/javascript" src="//cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.ui.colorpicker.js"></script>
178+
<script type="text/javascript" src="//cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.ui.colorpickersplitbutton.js"></script>
179+
<script type="text/javascript" src="//cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.ui.htmleditor.js"></script>
165180
<script type="text/javascript" src="../../src/igniteui-angular.js"></script>
166181
<script type="text/javascript" src="js/my-app-utils.js"></script>
167182
<script type="text/javascript" src="js/my-app.js"></script>

test/app/js/my-app.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1247,7 +1247,7 @@ var NorthwindCtrl = function ($scope, $element, $compile) {
12471247
];
12481248
$scope.editors = {
12491249
currency: 12.1,
1250-
date: new Date(),
1250+
date: new Date(2016, 0, 20),
12511251
editor: "some text",
12521252
mask: "134-134-134",
12531253
numeric: 123,

test/e2e/scenarios.js

Lines changed: 38 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -610,12 +610,22 @@ describe('my app', function() {
610610
});
611611
});
612612

613+
describe("HTML Editor", function() {
614+
it("should be initialized and have event handler", function() {
615+
util.isInitialized("htmlEditor1", "igHtmlEditor");
616+
expect(util.getResult('testEventListener("igHtmlEditor", "htmlEditor1", "actionExecuted")')).toBe(true);
617+
});
618+
});
619+
613620
describe("Editor", function() {
614-
it("Datepicker should be initialized", function() {
621+
it("Datepicker should be initialized and should be with a value from the scope", function() {
615622
util.isInitialized("datePicker1", "igDatePicker");
623+
expect(util.getResult('testEventListener("igDatePicker", "datePicker1", "mouseover")')).toBe(true);
624+
expect(util.getResult('$("#datePicker1").igDatePicker("value").getTime()')).toBe(new Date(2016, 0, 20).getTime());
616625
});
617626
it("Currency should be initialized and should be with a value from the scope", function() {
618627
util.isInitialized("currency1", "igCurrencyEditor");
628+
expect(util.getResult('testEventListener("igCurrencyEditor", "currency1", "mouseover")')).toBe(true);
619629
expect(util.getResult('$("#currency1").val()')).toBe("$12.10");
620630
});
621631
it("Currency should be changing its view when the model is changed", function() {
@@ -629,15 +639,35 @@ describe('my app', function() {
629639
var currencyInModel = 'angular.element("#currency1").scope().editors.currency;';
630640
expect(util.getResult(currencyInModel)).toBe(12.1);
631641
});
632-
it("Date should be initialized", function() {
642+
it("Date should be initialized and should be with a value from the scope", function() {
633643
util.isInitialized("date1","igDateEditor");
644+
expect(util.getResult('testEventListener("igDateEditor", "date1", "mouseover")')).toBe(true);
645+
expect(util.getResult('$("#date1").igDateEditor("value").getTime()')).toBe(new Date(2016, 0, 20).getTime());
646+
});
647+
it("Date should be changing its view when the model is changed", function() {
648+
var newTime = new Date(2016, 0, 20).getTime(),
649+
scope = 'angular.element("#currency1").scope()';
650+
util.executeScript(scope + '.editors.date = new Date('+ newTime +');');
651+
util.executeScript(scope + '.$apply();');
652+
expect(util.getResult('$("#date1").igDateEditor("value").getTime()')).toBe(newTime);
653+
expect(util.getResult('$("#datePicker1").igDatePicker("value").getTime()')).toBe(newTime);
654+
});
655+
it("Date should update model on value change", function() {
656+
var newDateString = "11/11/2016",
657+
dateInModel = 'angular.element("#date1").scope().editors.date.getTime();';
658+
util.executeScript('$("#date1").trigger("focus").val("' + newDateString + '").trigger("paste").trigger("blur")');
659+
expect(util.getResult(dateInModel)).toBe(new Date(newDateString).getTime());
660+
expect(util.getResult('$("#datePicker1").igDatePicker("value").getTime()')).toBe(new Date(newDateString).getTime());
634661
});
635-
it("Mask should be initialized", function() {
662+
it("Mask should be initialized and should be with a value from the scope", function() {
636663
util.isInitialized("mask1", "igMaskEditor");
664+
expect(util.getResult('testEventListener("igMaskEditor", "mask1", "mouseover")')).toBe(true);
665+
expect(util.getResult('$("#mask1").igMaskEditor("value")')).toBe("134-134-134");
637666
});
638667
it("Numeric should be initialized and should be with a value from the scope", function() {
639668
util.isInitialized("numeric1", "igNumericEditor");
640-
expect(util.getResult('$("#numeric1").val()')).toBe("12.1");
669+
expect(util.getResult('testEventListener("igNumericEditor", "numeric1", "mouseover")')).toBe(true);
670+
expect(util.getResult('$("#numeric1").igNumericEditor("value")')).toBe(12.1);
641671
});
642672
it("Numeric should be changing its view when the model is changed", function() {
643673
var scope = 'angular.element("#numeric1").scope()';
@@ -650,11 +680,14 @@ describe('my app', function() {
650680
var currencyInModel = 'angular.element("#numeric1").scope().editors.currency;';
651681
expect(util.getResult(currencyInModel)).toBe(123);
652682
});
653-
it("Percent should be initialized", function() {
683+
it("Percent should be initialized and should be with a value from the scope", function() {
654684
util.isInitialized("percent1", "igPercentEditor");
685+
expect(util.getResult('testEventListener("igPercentEditor", "percent1", "mouseover")')).toBe(true);
686+
expect(util.getResult('$("#percent1").igPercentEditor("value")')).toBe(12);
655687
});
656688
it("Text should be initialized", function() {
657689
util.isInitialized("text1", "igTextEditor");
690+
expect(util.getResult('testEventListener("igTextEditor", "text1", "mouseover")')).toBe(true);
658691
});
659692
it("Text should updated model correctly", function() {
660693
var textInModel = 'angular.element("#text1").scope().editors.text;';

0 commit comments

Comments
 (0)