Skip to content

Commit aa9fab4

Browse files
committed
Skip passed tests
1 parent f687338 commit aa9fab4

9 files changed

Lines changed: 17 additions & 18 deletions

File tree

apps/demos/Demos/DataGrid/MultipleRecordSelectionModes/Angular/app/app.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { bootstrapApplication } from '@angular/platform-browser';
22
import { Component, enableProdMode, provideZoneChangeDetection } from '@angular/core';
33
import { DxDataGridModule, DxSelectBoxModule } from 'devextreme-angular';
4-
import themes from 'devextreme/ui/themes';
4+
import themes, { isGeneric } from 'devextreme/ui/themes';
55
import { Service, Sale } from './app.service';
66

77
if (!/localhost/.test(document.location.host)) {
@@ -35,7 +35,7 @@ export class AppComponent {
3535
constructor(service: Service) {
3636
this.sales = service.getSales();
3737
this.allMode = 'allPages';
38-
this.checkBoxesMode = themes.current().startsWith('material') ? 'always' : 'onClick';
38+
this.checkBoxesMode = isGeneric(themes.current()) ? 'onClick' : 'always';
3939
}
4040
}
4141

apps/demos/Demos/DataGrid/MultipleRecordSelectionModes/React/App.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import DataGrid, {
88
Pager,
99
} from 'devextreme-react/data-grid';
1010
import { SelectBox } from 'devextreme-react/select-box';
11-
import themes from 'devextreme/ui/themes';
11+
import themes, { isGeneric } from 'devextreme/ui/themes';
1212
import { sales } from './data.ts';
1313

1414
const selectAllFieldLabel = { 'aria-label': 'Select All Mode' };
@@ -20,7 +20,7 @@ const selectAllModes = ['allPages', 'page'];
2020
const App = () => {
2121
const [allMode, setAllMode] = useState<DataGridTypes.SelectAllMode>('allPages');
2222
const [checkBoxesMode, setCheckBoxesMode] = useState<DataGridTypes.SelectionColumnDisplayMode>(
23-
themes.current().startsWith('material') ? 'always' : 'onClick',
23+
isGeneric(themes.current()) ? 'onClick' : 'always',
2424
);
2525

2626
const onCheckBoxesModeChanged = useCallback(({ value }) => {

apps/demos/Demos/DataGrid/MultipleRecordSelectionModes/ReactJs/App.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import DataGrid, {
33
Column, Selection, FilterRow, Paging, Pager,
44
} from 'devextreme-react/data-grid';
55
import { SelectBox } from 'devextreme-react/select-box';
6-
import themes from 'devextreme/ui/themes';
6+
import themes, { isGeneric } from 'devextreme/ui/themes';
77
import { sales } from './data.js';
88

99
const selectAllFieldLabel = { 'aria-label': 'Select All Mode' };
@@ -13,7 +13,7 @@ const selectAllModes = ['allPages', 'page'];
1313
const App = () => {
1414
const [allMode, setAllMode] = useState('allPages');
1515
const [checkBoxesMode, setCheckBoxesMode] = useState(
16-
themes.current().startsWith('material') ? 'always' : 'onClick',
16+
isGeneric(themes.current()) ? 'onClick' : 'always',
1717
);
1818
const onCheckBoxesModeChanged = useCallback(({ value }) => {
1919
setCheckBoxesMode(value);

apps/demos/Demos/DataGrid/MultipleRecordSelectionModes/Vue/App.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,13 +72,13 @@ import {
7272
DxPager,
7373
type DxDataGridTypes,
7474
} from 'devextreme-vue/data-grid';
75-
import themes from 'devextreme/ui/themes';
75+
import themes, { isGeneric } from 'devextreme/ui/themes';
7676
import { sales } from './data.ts';
7777
7878
const selectAllModes: DxDataGridTypes.SelectAllMode[] = ['allPages', 'page'];
7979
const showCheckBoxesModes: DxDataGridTypes.SelectionColumnDisplayMode[] = ['none', 'onClick', 'onLongTap', 'always'];
8080
const allMode = ref(selectAllModes[0]);
81-
const checkBoxesMode = ref<DxDataGridTypes.SelectionColumnDisplayMode>(themes.current().startsWith('material') ? 'always' : 'onClick');
81+
const checkBoxesMode = ref<DxDataGridTypes.SelectionColumnDisplayMode>(isGeneric(themes.current()) ? 'onClick' : 'always');
8282
</script>
8383
<style scoped>
8484
.options {

apps/demos/testing/skipped-tests.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ export const skippedTests = {
44
},
55
Angular: {
66
Common: ['PopupAndNotificationsOverview'],
7-
// DataGrid: ['SignalRService', 'MultipleRecordSelectionModes', 'RemoteCRUDOperations'],
7+
DataGrid: ['SignalRService'],
88
Scheduler: ['Templates'],
99
Map: ['ProvidersAndTypes', 'Markers', 'Routes'],
1010
Gantt: ['TaskTemplate', 'Validation'],
1111
},
1212
React: {
13-
// DataGrid: ['Toolbar', 'SignalRService', 'MultipleRecordSelectionModes'],
13+
DataGrid: ['SignalRService'],
1414
// NOTE: 'GroupByDate' demo has problems with rendering
1515
Scheduler: ['GroupByDate', 'Templates'],
1616
Map: ['ProvidersAndTypes', 'Markers', 'Routes'],
@@ -20,7 +20,7 @@ export const skippedTests = {
2020
Common: ['PopupAndNotificationsOverview'],
2121
Charts: ['PointsAggregation'],
2222
Scheduler: ['Templates'],
23-
// DataGrid: ['SignalRService', 'MultipleRecordSelectionModes'],
23+
DataGrid: ['SignalRService'],
2424
Map: ['ProvidersAndTypes', 'Markers', 'Routes'],
2525
Gantt: ['Validation'],
2626
},
-1.64 KB
Loading

apps/demos/utils/visual-tests/matrix-test-helper.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -205,12 +205,12 @@ export function shouldRunTestAtIndex(testIndex) {
205205

206206
const SKIPPED_TESTS = {
207207
jQuery: {
208-
// DataGrid: ['RemoteGrouping', 'EditStateManagement'],
208+
DataGrid: ['EditStateManagement'],
209209
},
210210
Angular: {
211211
Charts: ['Crosshair'],
212212
Common: ['PopupAndNotificationsOverview'],
213-
// DataGrid: ['EditStateManagement', 'Toolbar', 'RemoteGrouping', 'EditStateManagement'],
213+
DataGrid: ['EditStateManagement'],
214214
Scheduler: ['ContextMenu'],
215215
FileUploader: ['CustomDropzone'],
216216
},
@@ -219,14 +219,14 @@ const SKIPPED_TESTS = {
219219
Common: ['PopupAndNotificationsOverview'],
220220
// NOTE: Context menu item position is different across themes
221221
Scheduler: ['ContextMenu'],
222-
// DataGrid: ['EditStateManagement', 'Toolbar', 'RemoteGrouping', 'EditStateManagement'],
222+
DataGrid: ['EditStateManagement'],
223223
FileUploader: ['CustomDropzone'],
224224
},
225225
React: {
226226
Charts: ['Crosshair'],
227227
Common: ['PopupAndNotificationsOverview'],
228228
Scheduler: ['ContextMenu'],
229-
// DataGrid: ['EditStateManagement', 'Toolbar', 'RemoteGrouping', 'EditStateManagement'],
229+
DataGrid: ['EditStateManagement'],
230230
FileUploader: ['CustomDropzone'],
231231
},
232232
};

packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/dataGrid.tests.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -709,8 +709,7 @@ QUnit.module('Initialization', baseModuleConfig, () => {
709709
assert.equal(loadCallCount, 1, 'one load count on start');
710710
});
711711

712-
// T268912
713-
QUnit.skip('load from remote rest store when remoteOperations false', function(assert) {
712+
QUnit.test('load from remote rest store when remoteOperations false (T268912)', function(assert) {
714713
this.clock.restore();
715714
const done = assert.async();
716715
let errorMessage;

packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/selection.tests.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1161,7 +1161,7 @@ QUnit.module('Selection', { beforeEach: setupSelectionModule, afterEach: teardow
11611161
assert.strictEqual(selectionChangedCount, 1);
11621162
});
11631163

1164-
QUnit.skip('Not rise event on second set selectedRows without changes', function(assert) {
1164+
QUnit.test('Not rise event on second set selectedRows without changes', function(assert) {
11651165
let selectionChangedCount = 0;
11661166

11671167
this.applyOptions({

0 commit comments

Comments
 (0)