updates tests

material-components · Nov 11, 2019 · 2b8e67b · 2b8e67b
1 parent 897ede0
commit 2b8e67b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 14 deletions.
diff --git a/packages/mdc-linear-progress/constants.ts b/packages/mdc-linear-progress/constants.ts
@@ -28,9 +28,6 @@ export const cssClasses = {
 };
 
 export const strings = {
-  ARIA_LABEL: 'aria-label',
-  ARIA_VALUEMAX: 'aria-valuemax',
-  ARIA_VALUEMIN: 'aria-valuemin',
   ARIA_VALUENOW: 'aria-valuenow',
   BUFFER_SELECTOR: '.mdc-linear-progress__buffer',
   PRIMARY_BAR_SELECTOR: '.mdc-linear-progress__primary-bar',

diff --git a/packages/mdc-linear-progress/foundation.ts b/packages/mdc-linear-progress/foundation.ts
@@ -70,7 +70,7 @@ export class MDCLinearProgressFoundation extends MDCFoundation<MDCLinearProgress
 
     if (this.isDeterminate_) {
       this.adapter_.removeClass(cssClasses.INDETERMINATE_CLASS);
-      this.adapter_.setAttribute('aria-valuenow', this.progress_.toString());
+      this.adapter_.setAttribute(strings.ARIA_VALUENOW, this.progress_.toString());
       this.setScale_(this.adapter_.getPrimaryBar(), this.progress_);
       this.setScale_(this.adapter_.getBuffer(), this.buffer_);
     } else {
@@ -85,7 +85,7 @@ export class MDCLinearProgressFoundation extends MDCFoundation<MDCLinearProgress
         this.adapter_.addClass(cssClasses.REVERSED_CLASS);
       }
       this.adapter_.addClass(cssClasses.INDETERMINATE_CLASS);
-      this.adapter_.removeAttribute('aria-valuenow');
+      this.adapter_.removeAttribute(strings.ARIA_VALUENOW);
       this.setScale_(this.adapter_.getPrimaryBar(), 1);
       this.setScale_(this.adapter_.getBuffer(), 1);
     }
@@ -95,7 +95,7 @@ export class MDCLinearProgressFoundation extends MDCFoundation<MDCLinearProgress
     this.progress_ = value;
     if (this.isDeterminate_) {
       this.setScale_(this.adapter_.getPrimaryBar(), value);
-      this.adapter_.setAttribute('aria-valuenow', value.toString());
+      this.adapter_.setAttribute(strings.ARIA_VALUENOW, value.toString());
     }
   }
 

diff --git a/test/unit/mdc-linear-progress/foundation.test.js b/test/unit/mdc-linear-progress/foundation.test.js
@@ -28,7 +28,7 @@ import {setupFoundationTest} from '../helpers/setup';
 import {verifyDefaultAdapter} from '../helpers/foundation';
 import {MDCLinearProgressFoundation} from '../../../packages/mdc-linear-progress/foundation';
 
-const {cssClasses} = MDCLinearProgressFoundation;
+const {cssClasses, strings} = MDCLinearProgressFoundation;
 
 suite('MDCLinearProgressFoundation');
 
@@ -48,7 +48,7 @@ test('defaultAdapter returns a complete adapter implementation', () => {
 
 const setupTest = () => setupFoundationTest(MDCLinearProgressFoundation);
 
-test('#setDeterminate adds class, resets transforms, and removes aria-valuenow', () => {
+test('#setDeterminate false adds class, resets transforms, and removes aria-valuenow', () => {
   const {foundation, mockAdapter} = setupTest();
   td.when(mockAdapter.hasClass(cssClasses.INDETERMINATE_CLASS)).thenReturn(false);
   const primaryBar = {};
@@ -60,7 +60,7 @@ test('#setDeterminate adds class, resets transforms, and removes aria-valuenow',
   td.verify(mockAdapter.addClass(cssClasses.INDETERMINATE_CLASS));
   td.verify(mockAdapter.setStyle(primaryBar, 'transform', 'scaleX(1)'));
   td.verify(mockAdapter.setStyle(buffer, 'transform', 'scaleX(1)'));
-  td.verify(mockAdapter.removeAttribute('aria-valuenow'));
+  td.verify(mockAdapter.removeAttribute(strings.ARIA_VALUENOW));
 });
 
 test('#setDeterminate removes class', () => {
@@ -88,7 +88,7 @@ test('#setDeterminate restores previous progress value after toggled from false
   foundation.setDeterminate(false);
   foundation.setDeterminate(true);
   td.verify(mockAdapter.setStyle(primaryBar, 'transform', 'scaleX(0.123)'), {times: 2});
-  td.verify(mockAdapter.setAttribute('aria-valuenow', '0.123'), {times: 2});
+  td.verify(mockAdapter.setAttribute(strings.ARIA_VALUENOW, '0.123'), {times: 2});
 });
 
 test('#setDeterminate restores previous buffer value after toggled from false to true', () => {
@@ -111,7 +111,7 @@ test('#setDeterminate updates progress value set while determinate is false afte
   foundation.setProgress(0.123);
   foundation.setDeterminate(true);
   td.verify(mockAdapter.setStyle(primaryBar, 'transform', 'scaleX(0.123)'));
-  td.verify(mockAdapter.setAttribute('aria-valuenow', '0.123'));
+  td.verify(mockAdapter.setAttribute(strings.ARIA_VALUENOW, '0.123'));
 });
 
 test('#setProgress sets transform and aria-valuenow', () => {
@@ -122,7 +122,7 @@ test('#setProgress sets transform and aria-valuenow', () => {
   foundation.init();
   foundation.setProgress(0.5);
   td.verify(mockAdapter.setStyle(primaryBar, 'transform', 'scaleX(0.5)'));
-  td.verify(mockAdapter.setAttribute('aria-valuenow', '0.5'));
+  td.verify(mockAdapter.setAttribute(strings.ARIA_VALUENOW, '0.5'));
 });
 
 test('#setProgress on indeterminate does nothing', () => {

diff --git a/test/unit/mdc-linear-progress/mdc-linear-progress.test.js b/test/unit/mdc-linear-progress/mdc-linear-progress.test.js
@@ -59,7 +59,7 @@ test('set indeterminate', () => {
 
   component.determinate = false;
   assert.isOk(root.classList.contains('mdc-linear-progress--indeterminate'));
-  assert.equal(undefined, root.getAttribute('aria-valuenow'));
+  assert.equal(undefined, root.getAttribute(MDCLinearProgressFoundation.strings.ARIA_VALUENOW));
 });
 
 test('set progress', () => {
@@ -68,7 +68,7 @@ test('set progress', () => {
   component.progress = 0.5;
   const primaryBar = root.querySelector(MDCLinearProgressFoundation.strings.PRIMARY_BAR_SELECTOR);
   assert.equal('scaleX(0.5)', primaryBar.style.transform);
-  assert.equal('0.5', root.getAttribute('aria-valuenow'));
+  assert.equal('0.5', root.getAttribute(MDCLinearProgressFoundation.strings.ARIA_VALUENOW));
 });
 
 test('set buffer', () => {