From 71d5ec5cb0b88358dd15e2d882b5c84f4aa25028 Mon Sep 17 00:00:00 2001 From: andrewseguin Date: Thu, 9 Jul 2020 14:57:10 -0700 Subject: [PATCH 1/2] test(material-experimental/mdc-radio): add e2e tests --- src/e2e-app/mdc-radio/mdc-radio-e2e.html | 13 +++++++++- src/e2e-app/mdc-radio/mdc-radio-e2e.ts | 3 ++- .../mdc-radio/BUILD.bazel | 18 ++++++++++++++ .../mdc-radio/radio.e2e.spec.ts | 24 ++++++++++++++++++- 4 files changed, 55 insertions(+), 3 deletions(-) diff --git a/src/e2e-app/mdc-radio/mdc-radio-e2e.html b/src/e2e-app/mdc-radio/mdc-radio-e2e.html index b95064bc6d97..87d60fc97175 100644 --- a/src/e2e-app/mdc-radio/mdc-radio-e2e.html +++ b/src/e2e-app/mdc-radio/mdc-radio-e2e.html @@ -1 +1,12 @@ - +
+ + + Charmander + Squirtle + Bulbasaur + + + +
diff --git a/src/e2e-app/mdc-radio/mdc-radio-e2e.ts b/src/e2e-app/mdc-radio/mdc-radio-e2e.ts index 6a1b3623395c..59da7f22436a 100644 --- a/src/e2e-app/mdc-radio/mdc-radio-e2e.ts +++ b/src/e2e-app/mdc-radio/mdc-radio-e2e.ts @@ -13,5 +13,6 @@ import {Component} from '@angular/core'; templateUrl: 'mdc-radio-e2e.html', }) export class MdcRadioE2e { - // TODO: copy implementation from existing mat-radio e2e page. + isGroupDisabled: boolean = false; + groupValue: string; } diff --git a/src/material-experimental/mdc-radio/BUILD.bazel b/src/material-experimental/mdc-radio/BUILD.bazel index affa777554ff..8192b0954410 100644 --- a/src/material-experimental/mdc-radio/BUILD.bazel +++ b/src/material-experimental/mdc-radio/BUILD.bazel @@ -1,8 +1,10 @@ +load("//src/e2e-app:test_suite.bzl", "e2e_test_suite") load( "//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite", + "ng_e2e_test_library", "sass_binary", "sass_library", ) @@ -80,3 +82,19 @@ ng_web_test_suite( "//src/material-experimental:mdc_require_config.js", ], ) + +ng_e2e_test_library( + name = "e2e_test_sources", + srcs = glob(["**/*.e2e.spec.ts"]), + deps = [ + "//src/cdk/testing/private/e2e", + ], +) + +e2e_test_suite( + name = "e2e_tests", + deps = [ + ":e2e_test_sources", + "//src/cdk/testing/private/e2e", + ], +) diff --git a/src/material-experimental/mdc-radio/radio.e2e.spec.ts b/src/material-experimental/mdc-radio/radio.e2e.spec.ts index 4882d270483e..28547d644a4f 100644 --- a/src/material-experimental/mdc-radio/radio.e2e.spec.ts +++ b/src/material-experimental/mdc-radio/radio.e2e.spec.ts @@ -1 +1,23 @@ -// TODO: copy tests from existing mat-radio, update as necessary to fix. +import {browser, by, element} from 'protractor'; + + +describe('radio', () => { + describe('disabling behavior', () => { + beforeEach(async () => await browser.get('/mdc-radio')); + + it('should be checked when clicked', async () => { + await element(by.id('water')).click(); + expect(await element(by.css('input:checked')).getAttribute('value')).toBe('water'); + + await element(by.id('leaf')).click(); + expect(await element(by.css('input:checked')).getAttribute('value')).toBe('leaf'); + }); + + it('should be disabled when disable the radio group', async () => { + await element(by.id('toggle-disable')).click(); + await element(by.id('water')).click(); + + expect(await element(by.css('input[id=water-input]')).getAttribute('disabled')).toBe('true'); + }); + }); +}); From 27a7266a090a87c46aef817d8a65078bb313fe5e Mon Sep 17 00:00:00 2001 From: andrewseguin Date: Fri, 10 Jul 2020 06:48:53 -0700 Subject: [PATCH 2/2] lint --- src/material-experimental/mdc-radio/BUILD.bazel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/material-experimental/mdc-radio/BUILD.bazel b/src/material-experimental/mdc-radio/BUILD.bazel index 8192b0954410..d7cf6d446be9 100644 --- a/src/material-experimental/mdc-radio/BUILD.bazel +++ b/src/material-experimental/mdc-radio/BUILD.bazel @@ -1,10 +1,10 @@ load("//src/e2e-app:test_suite.bzl", "e2e_test_suite") load( "//tools:defaults.bzl", + "ng_e2e_test_library", "ng_module", "ng_test_library", "ng_web_test_suite", - "ng_e2e_test_library", "sass_binary", "sass_library", )