From 9018a47296eab3b8b425eaaf81139d560f45f9cc Mon Sep 17 00:00:00 2001
From: Suguru Hirahara <luixxiul@gmail.com>
Date: Thu, 6 Apr 2017 04:20:17 +0900
Subject: [PATCH] Replaced other test ids in Buttons

Also: modified classNames with cx.

Closes #8090

Auditors:

Test Plan:
1. Open the browser
2. Check for update
3. Make sure the buttons work
---
 js/components/updateBar.js | 33 ++++++++++++++++++++++++---------
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/js/components/updateBar.js b/js/components/updateBar.js
index df79cdaa13f..d398574b5c0 100644
--- a/js/components/updateBar.js
+++ b/js/components/updateBar.js
@@ -62,8 +62,11 @@ class UpdateHello extends ImmutableComponent {
 
 class UpdateHide extends ImmutableComponent {
   render () {
-    return <Button className={css(commonStyles.notificationItem__button) + ' ' + 'whiteButton'}
-      data-test-id='updateHide'
+    return <Button className={cx({
+      [css(commonStyles.notificationItem__button)]: true,
+      whiteButton: true
+    })}
+      testId='updateHide'
       l10nId='updateHide'
       onClick={appActions.setUpdateStatus.bind(null, this.props.reset ? UpdateStatus.UPDATE_NONE : undefined, false, undefined)} />
   }
@@ -74,7 +77,10 @@ class UpdateLog extends ImmutableComponent {
     remote.shell.openItem(path.join(remote.app.getPath('userData'), 'updateLog.log'))
   }
   render () {
-    return <Button className={css(commonStyles.notificationItem__button) + ' ' + 'whiteButton'}
+    return <Button className={cx({
+      [css(commonStyles.notificationItem__button)]: true,
+      whiteButton: true
+    })}
       testId='updateViewLogButton'
       l10nId='updateViewLog'
       onClick={this.onViewLog.bind(this)} />
@@ -92,18 +98,27 @@ class UpdateAvailable extends ImmutableComponent {
       <span className={css(styles.flexAlignCenter)} data-test-id='notificationOptions'>
         {
           this.props.metadata && this.props.metadata.get('notes')
-          ? <Button className={css(commonStyles.notificationItem__button) + ' ' + 'whiteButton'}
-            data-test-id='updateDetails'
+          ? <Button className={cx({
+            [css(commonStyles.notificationItem__button)]: true,
+            whiteButton: true
+          })}
+            testId='updateDetails'
             l10nId='updateDetails'
             onClick={windowActions.setReleaseNotesVisible.bind(null, true)} />
           : null
         }
-        <Button className={css(commonStyles.notificationItem__button) + ' ' + 'whiteButton'}
-          data-test-id='updateLater'
+        <Button className={cx({
+          [css(commonStyles.notificationItem__button)]: true,
+          whiteButton: true
+        })}
+          testId='updateLater'
           l10nId='updateLater'
           onClick={appActions.setUpdateStatus.bind(null, UpdateStatus.UPDATE_AVAILABLE_DEFERRED, false, undefined)} />
-        <Button className={css(commonStyles.notificationItem__button) + ' ' + 'primaryButton'}
-          data-test-id='updateNow'
+        <Button className={cx({
+          [css(commonStyles.notificationItem__button)]: true,
+          primaryButton: true
+        })}
+          testId='updateNow'
           l10nId='updateNow'
           onClick={appActions.setUpdateStatus.bind(null, UpdateStatus.UPDATE_APPLYING_RESTART, false, undefined)} />
       </span>