From 5283e234a189942e396a0ece6eff47ce648ffdf2 Mon Sep 17 00:00:00 2001
From: Benjamin Graham <benwilliamgraham@gmail.com>
Date: Wed, 27 May 2020 09:40:44 -0400
Subject: [PATCH] Fixed and simplified tests

Gave buttons IDs for ease of access, fixed `fit-to` testing to
better reflect purpose, and fixed occasional timing error in
`testSkipFrame` caused by call overlap
---
 src/config.jsx         |  4 ++--
 src/player.jsx         |  2 +-
 src/recordings.jsx     |  2 +-
 test/check-application | 24 ++++++++++++------------
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/config.jsx b/src/config.jsx
index dcb24a2..b1e9d4a 100644
--- a/src/config.jsx
+++ b/src/config.jsx
@@ -321,7 +321,7 @@ class Config extends React.Component {
                             </tr>
                             <tr>
                                 <td className="top">
-                                    <button className="btn btn-default" type="submit">Save</button>
+                                    <button id="btn-save-tlog-conf" className="btn btn-default" type="submit">Save</button>
                                 </td>
                                 <td>
                                     <span style={{display: this.state.submitting}}>Saving...</span>
@@ -461,7 +461,7 @@ class SssdConfig extends React.Component {
                         </tr>
                         }
                         <tr>
-                            <td><button className="btn btn-default" type="submit">Save</button></td>
+                            <td><button id="btn-save-sssd-conf" className="btn btn-default" type="submit">Save</button></td>
                             <td>
                                 <span style={{display: this.state.submitting}}>Saving...</span>
                             </td>
diff --git a/src/player.jsx b/src/player.jsx
index dda4384..b614c05 100644
--- a/src/player.jsx
+++ b/src/player.jsx
@@ -1276,7 +1276,7 @@ export class Player extends React.Component {
                                             onClick={this.speedUp}>
                                         x2
                                     </button>
-                                    <span>{speedStr}</span>
+                                    <span id="player-speed">{speedStr}</span>
                                     <span style={to_right}>
                                         <span className="session_time">{formatDuration(this.currentTsPost)} / {formatDuration(this.buf.pos)}</span>
                                         <button id="player-drag-pan" title="Drag'n'Pan" type="button" className="btn btn-default btn-lg"
diff --git a/src/recordings.jsx b/src/recordings.jsx
index 48ebb8a..acdba42 100644
--- a/src/recordings.jsx
+++ b/src/recordings.jsx
@@ -970,7 +970,7 @@ class View extends React.Component {
                                         <label className="control-label" htmlFor="config">{_("Configuration")}</label>
                                     </td>
                                     <td className="top">
-                                        <button className="btn btn-default" onClick={this.openConfig}><i className="fa fa-cog" aria-hidden="true" /></button>
+                                        <button id="btn-config" className="btn btn-default" onClick={this.openConfig}><i className="fa fa-cog" aria-hidden="true" /></button>
                                     </td>
                                 </tr>
                             </thead>
diff --git a/test/check-application b/test/check-application
index d1dfded..1cb8509 100755
--- a/test/check-application
+++ b/test/check-application
@@ -44,7 +44,7 @@ class TestApplication(MachineCase):
         b.wait_attr(slider, "style", "left: 100%;")
 
     def testSpeedControls(self):
-        speed_val = ".panel-footer > span:nth-child(10)"
+        speed_val = "#player-speed"
         b = self.browser
         m = self.machine
         self.login_and_go("/session-recording")
@@ -92,10 +92,11 @@ class TestApplication(MachineCase):
         zoom_three_scale_sel = '.console-ct[style^="transform: scale(1.3)"]'
         b = self.browser
         m = self.machine
-        if m.image in ["rhel-8-0", "rhel-8-1", "rhel-8-2", "rhel-8-3"]:
-            zoom_reset_scale_sel = '.console-ct[style*="transform: scale(0.8"]'
-        else:
-            zoom_reset_scale_sel = '.console-ct[style*="transform: scale(0.9"]'
+        zoom_fit_to = (
+            '.console-ct[style*="translate(-50%, -50%)"]'
+            '[style*="top: 50%"]'
+            '[style*="left: 50%"]'
+        )
 
         self.login_and_go("/session-recording")
         b.wait_present(".content-header-extra")
@@ -113,9 +114,9 @@ class TestApplication(MachineCase):
         # Zoom Out
         b.click("#player-zoom-out")
         b.wait_present(zoom_two_scale_sel)
-        # Reset Zoom
+        # Fit zoom to screen
         b.click("#player-fit-to")
-        b.wait_present(zoom_reset_scale_sel)
+        b.wait_present(zoom_fit_to)
 
     def testSkipFrame(self):
         term_first_line = ".xterm-accessibility-tree div:nth-child(1)"
@@ -125,11 +126,10 @@ class TestApplication(MachineCase):
         b.wait_present(".content-header-extra")
         b.wait_present("#user")
         b.click(".listing-ct-item")
-        b.click("#player-skip-frame")
-        b.click("#player-skip-frame")
-        b.click("#player-skip-frame")
-        b.click("#player-skip-frame")
-        b.click("#player-skip-frame")
+        b.wait_present(term_first_line)
+        # loop until 3 valid frames have passed
+        while "localhost" not in b.text(term_first_line):
+            b.click("#player-skip-frame")
         b.wait_timeout(20)
         b.wait_in_text(term_first_line, "localhost")