Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(300)

Side by Side Diff: chrome/test/data/webui/settings/device_page_tests.js

Issue 2957153003: MD Settings: remove unsupported routes from guest-mode. (Closed)
Patch Set: merge Created 3 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 cr.define('device_page_tests', function() { 5 cr.define('device_page_tests', function() {
6 /** @enum {string} */ 6 /** @enum {string} */
7 var TestNames = { 7 var TestNames = {
8 DevicePage: 'device page', 8 DevicePage: 'device page',
9 Display: 'display', 9 Display: 'display',
10 Keyboard: 'keyboard', 10 Keyboard: 'keyboard',
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 suiteSetup(function() { 239 suiteSetup(function() {
240 // Disable animations so sub-pages open within one event loop. 240 // Disable animations so sub-pages open within one event loop.
241 testing.Test.disableAnimationsAndTransitions(); 241 testing.Test.disableAnimationsAndTransitions();
242 }); 242 });
243 243
244 setup(function(done) { 244 setup(function(done) {
245 fakeSystemDisplay = new settings.FakeSystemDisplay(); 245 fakeSystemDisplay = new settings.FakeSystemDisplay();
246 settings.display.systemDisplayApi = fakeSystemDisplay; 246 settings.display.systemDisplayApi = fakeSystemDisplay;
247 247
248 PolymerTest.clearBody(); 248 PolymerTest.clearBody();
249 settings.navigateTo(settings.Route.BASIC); 249 settings.navigateTo(settings.routes.BASIC);
250 250
251 devicePage = document.createElement('settings-device-page'); 251 devicePage = document.createElement('settings-device-page');
252 devicePage.prefs = getFakePrefs(); 252 devicePage.prefs = getFakePrefs();
253 settings.DevicePageBrowserProxyImpl.instance_ = 253 settings.DevicePageBrowserProxyImpl.instance_ =
254 new TestDevicePageBrowserProxy(); 254 new TestDevicePageBrowserProxy();
255 255
256 // settings-animated-pages expects a parent with data-page set. 256 // settings-animated-pages expects a parent with data-page set.
257 var basicPage = document.createElement('div'); 257 var basicPage = document.createElement('div');
258 basicPage.dataset.page = 'basic'; 258 basicPage.dataset.page = 'basic';
259 basicPage.appendChild(devicePage); 259 basicPage.appendChild(devicePage);
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
337 cr.webUIListenerCallback('has-touchpad-changed', false); 337 cr.webUIListenerCallback('has-touchpad-changed', false);
338 expectEquals(0, devicePage.$$('#pointersRow').offsetHeight); 338 expectEquals(0, devicePage.$$('#pointersRow').offsetHeight);
339 cr.webUIListenerCallback('has-mouse-changed', true); 339 cr.webUIListenerCallback('has-mouse-changed', true);
340 expectLT(0, devicePage.$$('#pointersRow').offsetHeight); 340 expectLT(0, devicePage.$$('#pointersRow').offsetHeight);
341 }); 341 });
342 342
343 suite(assert(TestNames.Pointers), function() { 343 suite(assert(TestNames.Pointers), function() {
344 var pointersPage; 344 var pointersPage;
345 345
346 setup(function() { 346 setup(function() {
347 return showAndGetDeviceSubpage( 347 return showAndGetDeviceSubpage('pointers', settings.routes.POINTERS)
348 'pointers', settings.Route.POINTERS).then(function(page) { 348 .then(function(page) {
349 pointersPage = page; 349 pointersPage = page;
350 }); 350 });
351 }); 351 });
352 352
353 test('subpage responds to pointer attach/detach', function() { 353 test('subpage responds to pointer attach/detach', function() {
354 assertEquals(settings.Route.POINTERS, settings.getCurrentRoute()); 354 assertEquals(settings.routes.POINTERS, settings.getCurrentRoute());
355 assertLT(0, pointersPage.$$('#mouse').offsetHeight); 355 assertLT(0, pointersPage.$$('#mouse').offsetHeight);
356 assertLT(0, pointersPage.$$('#touchpad').offsetHeight); 356 assertLT(0, pointersPage.$$('#touchpad').offsetHeight);
357 assertLT(0, pointersPage.$$('#mouse h2').offsetHeight); 357 assertLT(0, pointersPage.$$('#mouse h2').offsetHeight);
358 assertLT(0, pointersPage.$$('#touchpad h2').offsetHeight); 358 assertLT(0, pointersPage.$$('#touchpad h2').offsetHeight);
359 359
360 cr.webUIListenerCallback('has-touchpad-changed', false); 360 cr.webUIListenerCallback('has-touchpad-changed', false);
361 assertEquals(settings.Route.POINTERS, settings.getCurrentRoute()); 361 assertEquals(settings.routes.POINTERS, settings.getCurrentRoute());
362 assertLT(0, pointersPage.$$('#mouse').offsetHeight); 362 assertLT(0, pointersPage.$$('#mouse').offsetHeight);
363 assertEquals(0, pointersPage.$$('#touchpad').offsetHeight); 363 assertEquals(0, pointersPage.$$('#touchpad').offsetHeight);
364 assertEquals(0, pointersPage.$$('#mouse h2').offsetHeight); 364 assertEquals(0, pointersPage.$$('#mouse h2').offsetHeight);
365 assertEquals(0, pointersPage.$$('#touchpad h2').offsetHeight); 365 assertEquals(0, pointersPage.$$('#touchpad h2').offsetHeight);
366 366
367 // Wait for the transition back to the main page. 367 // Wait for the transition back to the main page.
368 return new Promise(function(resolve, reject) { 368 return new Promise(function(resolve, reject) {
369 devicePage.$$('#pages').addEventListener( 369 devicePage.$$('#pages').addEventListener(
370 'neon-animation-finish', resolve); 370 'neon-animation-finish', resolve);
371 371
372 cr.webUIListenerCallback('has-mouse-changed', false); 372 cr.webUIListenerCallback('has-mouse-changed', false);
373 }).then(function() { 373 })
374 assertEquals(settings.Route.DEVICE, settings.getCurrentRoute()); 374 .then(function() {
375 assertEquals(0, devicePage.$$('#main #pointersRow').offsetHeight); 375 assertEquals(settings.routes.DEVICE, settings.getCurrentRoute());
376 assertEquals(0, devicePage.$$('#main #pointersRow').offsetHeight);
376 377
377 cr.webUIListenerCallback('has-touchpad-changed', true); 378 cr.webUIListenerCallback('has-touchpad-changed', true);
378 assertLT(0, devicePage.$$('#main #pointersRow').offsetHeight); 379 assertLT(0, devicePage.$$('#main #pointersRow').offsetHeight);
379 return showAndGetDeviceSubpage('pointers', settings.Route.POINTERS); 380 return showAndGetDeviceSubpage(
380 }).then(function(page) { 381 'pointers', settings.routes.POINTERS);
381 assertEquals(0, pointersPage.$$('#mouse').offsetHeight); 382 })
382 assertLT(0, pointersPage.$$('#touchpad').offsetHeight); 383 .then(function(page) {
383 assertEquals(0, pointersPage.$$('#mouse h2').offsetHeight); 384 assertEquals(0, pointersPage.$$('#mouse').offsetHeight);
384 assertEquals(0, pointersPage.$$('#touchpad h2').offsetHeight); 385 assertLT(0, pointersPage.$$('#touchpad').offsetHeight);
386 assertEquals(0, pointersPage.$$('#mouse h2').offsetHeight);
387 assertEquals(0, pointersPage.$$('#touchpad h2').offsetHeight);
385 388
386 cr.webUIListenerCallback('has-mouse-changed', true); 389 cr.webUIListenerCallback('has-mouse-changed', true);
387 assertEquals(settings.Route.POINTERS, settings.getCurrentRoute()); 390 assertEquals(
388 assertLT(0, pointersPage.$$('#mouse').offsetHeight); 391 settings.routes.POINTERS, settings.getCurrentRoute());
389 assertLT(0, pointersPage.$$('#touchpad').offsetHeight); 392 assertLT(0, pointersPage.$$('#mouse').offsetHeight);
390 assertLT(0, pointersPage.$$('#mouse h2').offsetHeight); 393 assertLT(0, pointersPage.$$('#touchpad').offsetHeight);
391 assertLT(0, pointersPage.$$('#touchpad h2').offsetHeight); 394 assertLT(0, pointersPage.$$('#mouse h2').offsetHeight);
392 }); 395 assertLT(0, pointersPage.$$('#touchpad h2').offsetHeight);
396 });
393 }); 397 });
394 398
395 test('mouse', function() { 399 test('mouse', function() {
396 expectLT(0, pointersPage.$$('#mouse').offsetHeight); 400 expectLT(0, pointersPage.$$('#mouse').offsetHeight);
397 401
398 expectFalse(pointersPage.$$('#mouse settings-toggle-button').checked); 402 expectFalse(pointersPage.$$('#mouse settings-toggle-button').checked);
399 403
400 var slider = assert(pointersPage.$$('#mouse settings-slider')); 404 var slider = assert(pointersPage.$$('#mouse settings-slider'));
401 expectEquals(4, slider.pref.value); 405 expectEquals(4, slider.pref.value);
402 MockInteractions.pressAndReleaseKeyOn( 406 MockInteractions.pressAndReleaseKeyOn(
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
452 Polymer.Base.async(function() { 456 Polymer.Base.async(function() {
453 expectNaturalScrollValue(pointersPage, true); 457 expectNaturalScrollValue(pointersPage, true);
454 done(); 458 done();
455 }, 1); 459 }, 1);
456 }, 1); 460 }, 1);
457 }); 461 });
458 }); 462 });
459 463
460 test(assert(TestNames.Keyboard), function() { 464 test(assert(TestNames.Keyboard), function() {
461 // Open the keyboard subpage. 465 // Open the keyboard subpage.
462 return showAndGetDeviceSubpage( 466 return showAndGetDeviceSubpage('keyboard', settings.routes.KEYBOARD)
463 'keyboard', settings.Route.KEYBOARD).then(function(keyboardPage) { 467 .then(function(keyboardPage) {
464 // Initially, the optional keys are hidden. 468 // Initially, the optional keys are hidden.
465 expectFalse(!!keyboardPage.$$('#capsLockKey')); 469 expectFalse(!!keyboardPage.$$('#capsLockKey'));
466 expectFalse(!!keyboardPage.$$('#diamondKey')); 470 expectFalse(!!keyboardPage.$$('#diamondKey'));
467 471
468 // Pretend the diamond key is available. 472 // Pretend the diamond key is available.
469 var showCapsLock = false; 473 var showCapsLock = false;
470 var showDiamondKey = true; 474 var showDiamondKey = true;
471 cr.webUIListenerCallback( 475 cr.webUIListenerCallback(
472 'show-keys-changed', showCapsLock, showDiamondKey); 476 'show-keys-changed', showCapsLock, showDiamondKey);
473 Polymer.dom.flush(); 477 Polymer.dom.flush();
474 expectFalse(!!keyboardPage.$$('#capsLockKey')); 478 expectFalse(!!keyboardPage.$$('#capsLockKey'));
475 expectTrue(!!keyboardPage.$$('#diamondKey')); 479 expectTrue(!!keyboardPage.$$('#diamondKey'));
476 480
477 // Pretend a Caps Lock key is now available. 481 // Pretend a Caps Lock key is now available.
478 showCapsLock = true; 482 showCapsLock = true;
479 cr.webUIListenerCallback( 483 cr.webUIListenerCallback(
480 'show-keys-changed', showCapsLock, showDiamondKey); 484 'show-keys-changed', showCapsLock, showDiamondKey);
481 Polymer.dom.flush(); 485 Polymer.dom.flush();
482 expectTrue(!!keyboardPage.$$('#capsLockKey')); 486 expectTrue(!!keyboardPage.$$('#capsLockKey'));
483 expectTrue(!!keyboardPage.$$('#diamondKey')); 487 expectTrue(!!keyboardPage.$$('#diamondKey'));
484 488
485 var collapse = keyboardPage.$$('iron-collapse'); 489 var collapse = keyboardPage.$$('iron-collapse');
486 assertTrue(!!collapse); 490 assertTrue(!!collapse);
487 expectTrue(collapse.opened); 491 expectTrue(collapse.opened);
488 492
489 expectEquals(500, keyboardPage.$$('#delaySlider').pref.value); 493 expectEquals(500, keyboardPage.$$('#delaySlider').pref.value);
490 expectEquals(500, keyboardPage.$$('#repeatRateSlider').pref.value); 494 expectEquals(500, keyboardPage.$$('#repeatRateSlider').pref.value);
491 495
492 // Test interaction with the settings-slider's underlying paper-slider. 496 // Test interaction with the settings-slider's underlying
493 MockInteractions.pressAndReleaseKeyOn( 497 // paper-slider.
494 keyboardPage.$$('#delaySlider').$$('#slider'), 37 /* left */); 498 MockInteractions.pressAndReleaseKeyOn(
495 MockInteractions.pressAndReleaseKeyOn( 499 keyboardPage.$$('#delaySlider').$$('#slider'), 37 /* left */);
496 keyboardPage.$$('#repeatRateSlider').$$('#slider'), 39 /* right */); 500 MockInteractions.pressAndReleaseKeyOn(
497 var language = devicePage.prefs.settings.language; 501 keyboardPage.$$('#repeatRateSlider').$$('#slider'),
498 expectEquals(1000, language.xkb_auto_repeat_delay_r2.value); 502 39 /* right */);
499 expectEquals(300, language.xkb_auto_repeat_interval_r2.value); 503 var language = devicePage.prefs.settings.language;
504 expectEquals(1000, language.xkb_auto_repeat_delay_r2.value);
505 expectEquals(300, language.xkb_auto_repeat_interval_r2.value);
500 506
501 // Test sliders change when prefs change. 507 // Test sliders change when prefs change.
502 devicePage.set( 508 devicePage.set(
503 'prefs.settings.language.xkb_auto_repeat_delay_r2.value', 1500); 509 'prefs.settings.language.xkb_auto_repeat_delay_r2.value', 1500);
504 expectEquals(1500, keyboardPage.$$('#delaySlider').pref.value); 510 expectEquals(1500, keyboardPage.$$('#delaySlider').pref.value);
505 devicePage.set( 511 devicePage.set(
506 'prefs.settings.language.xkb_auto_repeat_interval_r2.value', 512 'prefs.settings.language.xkb_auto_repeat_interval_r2.value',
507 2000); 513 2000);
508 expectEquals(2000, keyboardPage.$$('#repeatRateSlider').pref.value); 514 expectEquals(2000, keyboardPage.$$('#repeatRateSlider').pref.value);
509 515
510 // Test sliders round to nearest value when prefs change. 516 // Test sliders round to nearest value when prefs change.
511 devicePage.set( 517 devicePage.set(
512 'prefs.settings.language.xkb_auto_repeat_delay_r2.value', 600); 518 'prefs.settings.language.xkb_auto_repeat_delay_r2.value', 600);
513 expectEquals(500, keyboardPage.$$('#delaySlider').pref.value); 519 expectEquals(500, keyboardPage.$$('#delaySlider').pref.value);
514 devicePage.set( 520 devicePage.set(
515 'prefs.settings.language.xkb_auto_repeat_interval_r2.value', 45); 521 'prefs.settings.language.xkb_auto_repeat_interval_r2.value',
516 expectEquals(50, keyboardPage.$$('#repeatRateSlider').pref.value); 522 45);
523 expectEquals(50, keyboardPage.$$('#repeatRateSlider').pref.value);
517 524
518 devicePage.set( 525 devicePage.set(
519 'prefs.settings.language.xkb_auto_repeat_enabled_r2.value', 526 'prefs.settings.language.xkb_auto_repeat_enabled_r2.value',
520 false); 527 false);
521 expectFalse(collapse.opened); 528 expectFalse(collapse.opened);
522 529
523 // Test keyboard shortcut overlay button. 530 // Test keyboard shortcut overlay button.
524 MockInteractions.tap(keyboardPage.$$('#keyboardOverlay')); 531 MockInteractions.tap(keyboardPage.$$('#keyboardOverlay'));
525 expectEquals( 532 expectEquals(
526 1, 533 1,
527 settings.DevicePageBrowserProxyImpl.getInstance() 534 settings.DevicePageBrowserProxyImpl.getInstance()
528 .keyboardShortcutsOverlayShown_); 535 .keyboardShortcutsOverlayShown_);
529 }); 536 });
530 }); 537 });
531 538
532 test(assert(TestNames.Display), function() { 539 test(assert(TestNames.Display), function() {
533 var addDisplay = function(n) { 540 var addDisplay = function(n) {
534 var display = { 541 var display = {
535 id: 'fakeDisplayId' + n, 542 id: 'fakeDisplayId' + n,
536 name: 'fakeDisplayName' + n, 543 name: 'fakeDisplayName' + n,
537 mirroring: '', 544 mirroring: '',
538 isPrimary: n == 1, 545 isPrimary: n == 1,
539 rotation: 0, 546 rotation: 0,
540 modes: [], 547 modes: [],
541 bounds: { 548 bounds: {
542 left: 0, 549 left: 0,
543 top: 0, 550 top: 0,
544 width: 1920, 551 width: 1920,
545 height: 1080, 552 height: 1080,
546 }, 553 },
547 }; 554 };
548 fakeSystemDisplay.addDisplayForTest(display); 555 fakeSystemDisplay.addDisplayForTest(display);
549 }; 556 };
550 557
551 var displayPage; 558 var displayPage;
552 return Promise.all([ 559 return Promise
553 // Get the display sub-page. 560 .all([
554 showAndGetDeviceSubpage( 561 // Get the display sub-page.
555 'display', settings.Route.DISPLAY).then(function(page) { 562 showAndGetDeviceSubpage('display', settings.routes.DISPLAY)
556 displayPage = page; 563 .then(function(page) {
557 }), 564 displayPage = page;
558 // Wait for the initial call to getInfo. 565 }),
559 fakeSystemDisplay.getInfoCalled.promise, 566 // Wait for the initial call to getInfo.
560 ]).then(function() { 567 fakeSystemDisplay.getInfoCalled.promise,
561 // Add a display. 568 ])
562 addDisplay(1); 569 .then(function() {
563 fakeSystemDisplay.onDisplayChanged.callListeners(); 570 // Add a display.
571 addDisplay(1);
572 fakeSystemDisplay.onDisplayChanged.callListeners();
564 573
565 return Promise.all([ 574 return Promise.all([
566 fakeSystemDisplay.getInfoCalled.promise, 575 fakeSystemDisplay.getInfoCalled.promise,
567 fakeSystemDisplay.getLayoutCalled.promise, 576 fakeSystemDisplay.getLayoutCalled.promise,
568 ]); 577 ]);
569 }).then(function() { 578 })
570 // There should be a single display which should be primary and 579 .then(function() {
571 // selected. Mirroring should be disabled. 580 // There should be a single display which should be primary and
572 expectEquals(1, displayPage.displays.length); 581 // selected. Mirroring should be disabled.
573 expectEquals( 582 expectEquals(1, displayPage.displays.length);
574 displayPage.displays[0].id, displayPage.selectedDisplay.id); 583 expectEquals(
575 expectEquals( 584 displayPage.displays[0].id, displayPage.selectedDisplay.id);
576 displayPage.displays[0].id, displayPage.primaryDisplayId); 585 expectEquals(
577 expectFalse(displayPage.showMirror_(false, displayPage.displays)); 586 displayPage.displays[0].id, displayPage.primaryDisplayId);
578 expectFalse(displayPage.isMirrored_(displayPage.displays)); 587 expectFalse(displayPage.showMirror_(false, displayPage.displays));
588 expectFalse(displayPage.isMirrored_(displayPage.displays));
579 589
580 // Add a second display. 590 // Add a second display.
581 addDisplay(2); 591 addDisplay(2);
582 fakeSystemDisplay.onDisplayChanged.callListeners(); 592 fakeSystemDisplay.onDisplayChanged.callListeners();
583 593
584 return Promise.all([ 594 return Promise.all([
585 fakeSystemDisplay.getInfoCalled.promise, 595 fakeSystemDisplay.getInfoCalled.promise,
586 fakeSystemDisplay.getLayoutCalled.promise, 596 fakeSystemDisplay.getLayoutCalled.promise,
587 new Promise(function(resolve, reject) { setTimeout(resolve); }) 597 new Promise(function(resolve, reject) {
588 ]); 598 setTimeout(resolve);
589 }).then(function() { 599 })
590 // There should be two displays, the first should be primary and 600 ]);
591 // selected. Mirroring should be enabled but set to false. 601 })
592 expectEquals(2, displayPage.displays.length); 602 .then(function() {
593 expectEquals( 603 // There should be two displays, the first should be primary and
594 displayPage.displays[0].id, displayPage.selectedDisplay.id); 604 // selected. Mirroring should be enabled but set to false.
595 expectEquals(displayPage.displays[0].id, displayPage.primaryDisplayId); 605 expectEquals(2, displayPage.displays.length);
596 expectTrue(displayPage.showMirror_(false, displayPage.displays)); 606 expectEquals(
597 expectFalse(displayPage.isMirrored_(displayPage.displays)); 607 displayPage.displays[0].id, displayPage.selectedDisplay.id);
608 expectEquals(
609 displayPage.displays[0].id, displayPage.primaryDisplayId);
610 expectTrue(displayPage.showMirror_(false, displayPage.displays));
611 expectFalse(displayPage.isMirrored_(displayPage.displays));
598 612
599 // Select the second display and make it primary. Also change the 613 // Select the second display and make it primary. Also change the
600 // orientation of the second display. 614 // orientation of the second display.
601 var displayLayout = displayPage.$$('#displayLayout'); 615 var displayLayout = displayPage.$$('#displayLayout');
602 assertTrue(!!displayLayout); 616 assertTrue(!!displayLayout);
603 var displayDiv = displayLayout.$$('#_fakeDisplayId2'); 617 var displayDiv = displayLayout.$$('#_fakeDisplayId2');
604 assertTrue(!!displayDiv); 618 assertTrue(!!displayDiv);
605 MockInteractions.tap(displayDiv); 619 MockInteractions.tap(displayDiv);
606 expectEquals( 620 expectEquals(
607 displayPage.displays[1].id, displayPage.selectedDisplay.id); 621 displayPage.displays[1].id, displayPage.selectedDisplay.id);
608 622
609 displayPage.updatePrimaryDisplay_({target: {value: '0'}}); 623 displayPage.updatePrimaryDisplay_({target: {value: '0'}});
610 displayPage.onOrientationChange_({target: {value: '90'}}); 624 displayPage.onOrientationChange_({target: {value: '90'}});
611 fakeSystemDisplay.onDisplayChanged.callListeners(); 625 fakeSystemDisplay.onDisplayChanged.callListeners();
612 626
613 return Promise.all([ 627 return Promise.all([
614 fakeSystemDisplay.getInfoCalled.promise, 628 fakeSystemDisplay.getInfoCalled.promise,
615 fakeSystemDisplay.getLayoutCalled.promise, 629 fakeSystemDisplay.getLayoutCalled.promise,
616 new Promise(function(resolve, reject) { setTimeout(resolve); }) 630 new Promise(function(resolve, reject) {
617 ]); 631 setTimeout(resolve);
618 }).then(function() { 632 })
619 // Confirm that the second display is selected, primary, and rotated. 633 ]);
620 expectEquals(2, displayPage.displays.length); 634 })
621 expectEquals( 635 .then(function() {
622 displayPage.displays[1].id, displayPage.selectedDisplay.id); 636 // Confirm that the second display is selected, primary, and
623 expectTrue(displayPage.displays[1].isPrimary); 637 // rotated.
624 expectEquals(displayPage.displays[1].id, displayPage.primaryDisplayId); 638 expectEquals(2, displayPage.displays.length);
625 expectEquals(90, displayPage.displays[1].rotation); 639 expectEquals(
640 displayPage.displays[1].id, displayPage.selectedDisplay.id);
641 expectTrue(displayPage.displays[1].isPrimary);
642 expectEquals(
643 displayPage.displays[1].id, displayPage.primaryDisplayId);
644 expectEquals(90, displayPage.displays[1].rotation);
626 645
627 // Mirror the displays. 646 // Mirror the displays.
628 displayPage.onMirroredTap_(); 647 displayPage.onMirroredTap_();
629 fakeSystemDisplay.onDisplayChanged.callListeners(); 648 fakeSystemDisplay.onDisplayChanged.callListeners();
630 649
631 return Promise.all([ 650 return Promise.all([
632 fakeSystemDisplay.getInfoCalled.promise, 651 fakeSystemDisplay.getInfoCalled.promise,
633 fakeSystemDisplay.getLayoutCalled.promise, 652 fakeSystemDisplay.getLayoutCalled.promise,
634 new Promise(function(resolve, reject) { setTimeout(resolve); }) 653 new Promise(function(resolve, reject) {
635 ]); 654 setTimeout(resolve);
636 }).then(function() { 655 })
637 // Confirm that there is now only one display and that it is primary 656 ]);
638 // and mirroring is enabled. 657 })
639 expectEquals(1, displayPage.displays.length); 658 .then(function() {
640 expectEquals( 659 // Confirm that there is now only one display and that it is primary
641 displayPage.displays[0].id, displayPage.selectedDisplay.id); 660 // and mirroring is enabled.
642 expectTrue(displayPage.displays[0].isPrimary); 661 expectEquals(1, displayPage.displays.length);
643 expectTrue(displayPage.showMirror_(false, displayPage.displays)); 662 expectEquals(
644 expectTrue(displayPage.isMirrored_(displayPage.displays)); 663 displayPage.displays[0].id, displayPage.selectedDisplay.id);
645 }); 664 expectTrue(displayPage.displays[0].isPrimary);
665 expectTrue(displayPage.showMirror_(false, displayPage.displays));
666 expectTrue(displayPage.isMirrored_(displayPage.displays));
667 });
646 }); 668 });
647 669
648 suite(assert(TestNames.Power), function() { 670 suite(assert(TestNames.Power), function() {
649 /** 671 /**
650 * Sets power sources using a deep copy of |sources|. 672 * Sets power sources using a deep copy of |sources|.
651 * @param {Array<settings.PowerSource>} sources 673 * @param {Array<settings.PowerSource>} sources
652 * @param {string} powerSourceId 674 * @param {string} powerSourceId
653 * @param {bool} isLowPowerCharger 675 * @param {bool} isLowPowerCharger
654 */ 676 */
655 function setPowerSources(sources, powerSourceId, isLowPowerCharger) { 677 function setPowerSources(sources, powerSourceId, isLowPowerCharger) {
(...skipping 29 matching lines...) Expand all
685 var lidClosedToggle; 707 var lidClosedToggle;
686 708
687 suiteSetup(function() { 709 suiteSetup(function() {
688 // Always show power settings. 710 // Always show power settings.
689 loadTimeData.overrideValues({ 711 loadTimeData.overrideValues({
690 enablePowerSettings: true, 712 enablePowerSettings: true,
691 }); 713 });
692 }); 714 });
693 715
694 setup(function() { 716 setup(function() {
695 return showAndGetDeviceSubpage('power', settings.Route.POWER) 717 return showAndGetDeviceSubpage('power', settings.routes.POWER)
696 .then(function(page) { 718 .then(function(page) {
697 powerPage = page; 719 powerPage = page;
698 powerSourceRow = assert(powerPage.$$('#powerSourceRow')); 720 powerSourceRow = assert(powerPage.$$('#powerSourceRow'));
699 powerSourceWrapper = 721 powerSourceWrapper =
700 assert(powerSourceRow.querySelector('.md-select-wrapper')); 722 assert(powerSourceRow.querySelector('.md-select-wrapper'));
701 powerSourceSelect = assert(powerPage.$$('#powerSource')); 723 powerSourceSelect = assert(powerPage.$$('#powerSource'));
702 assertEquals( 724 assertEquals(
703 1, 725 1,
704 settings.DevicePageBrowserProxyImpl.getInstance() 726 settings.DevicePageBrowserProxyImpl.getInstance()
705 .updatePowerStatusCalled_); 727 .updatePowerStatusCalled_);
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after
926 948
927 949
928 suiteSetup(function() { 950 suiteSetup(function() {
929 // Always show stylus settings. 951 // Always show stylus settings.
930 loadTimeData.overrideValues({ 952 loadTimeData.overrideValues({
931 stylusAllowed: true, 953 stylusAllowed: true,
932 }); 954 });
933 }); 955 });
934 956
935 setup(function() { 957 setup(function() {
936 return showAndGetDeviceSubpage('stylus', settings.Route.STYLUS).then( 958 return showAndGetDeviceSubpage('stylus', settings.routes.STYLUS)
937 function(page) { 959 .then(function(page) {
938 stylusPage = page; 960 stylusPage = page;
939 browserProxy = settings.DevicePageBrowserProxyImpl.getInstance(); 961 browserProxy = settings.DevicePageBrowserProxyImpl.getInstance();
940 appSelector = assert(page.$$('#menu')); 962 appSelector = assert(page.$$('#menu'));
941 noAppsDiv = assert(page.$$('#no-apps')); 963 noAppsDiv = assert(page.$$('#no-apps'));
942 waitingDiv = assert(page.$$('#waiting')); 964 waitingDiv = assert(page.$$('#waiting'));
943 selectAppDiv = assert(page.$$('#select-app')); 965 selectAppDiv = assert(page.$$('#select-app'));
944 966
945 assertEquals(1, browserProxy.requestNoteTakingApps_); 967 assertEquals(1, browserProxy.requestNoteTakingApps_);
946 assertEquals('', browserProxy.setPreferredNoteTakingApp_); 968 assertEquals('', browserProxy.setPreferredNoteTakingApp_);
947 assert(browserProxy.onNoteTakingAppsUpdated_); 969 assert(browserProxy.onNoteTakingAppsUpdated_);
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after
1190 .value); 1212 .value);
1191 }); 1213 });
1192 }); 1214 });
1193 }); 1215 });
1194 }); 1216 });
1195 1217
1196 return { 1218 return {
1197 TestNames: TestNames 1219 TestNames: TestNames
1198 }; 1220 };
1199 }); 1221 });
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698