From 53fcc86ae3dee750840e8d3322f662b8e995b02c Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Thu, 11 Jun 2015 09:57:40 -0700
Subject: [PATCH] avoid branded areas, tighten 'Done' button matches

Summary:
Two needles (at least, there may be more) fail to match properly
with Rawhide (F23) because the top part of some screens now has
branding, while before it was plain grey. On root_password_screen
we can just throw that match away, we don't really need it, the
text 'Root Password:' seems specific enough to be reliable. On
user_creation_screen let's replace the branded area match with a
couple of the text box labels.

This also tightens the 'Done' button match area on both spokes;
the original area is too loose and covers some of the now-branded
area outside the button, so the match fails.

This fixes the default_install test for 2015-06-07 nightly.

Test Plan:
Try a test run against the 2015-06-07 nightly and see if the
default_install test passes. Maybe also check that it still
passes for an F22 build.

Reviewers: garretraziel, jskladan

Reviewed By: jskladan

Subscribers: tflink

Differential Revision: https://phab.qadevel.cloud.fedoraproject.org/D386
---
 ...anaconda_install_root_password_screen.json | 15 ++++--------
 ...anaconda_install_user_creation_screen.json | 23 ++++++++++++-------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/needles/anaconda_install_root_password_screen.json b/needles/anaconda_install_root_password_screen.json
index f57ec91f..ca76c1ed 100644
--- a/needles/anaconda_install_root_password_screen.json
+++ b/needles/anaconda_install_root_password_screen.json
@@ -1,17 +1,10 @@
 {
   "area": [
     {
-      "xpos": 8,
-      "ypos": 8,
-      "width": 140,
-      "height": 18,
-      "type": "match"
-    },
-    {
-      "xpos": 8,
-      "ypos": 46,
+      "xpos": 7,
+      "ypos": 47,
       "width": 63,
-      "height": 32,
+      "height": 29,
       "type": "match"
     },
     {
@@ -29,4 +22,4 @@
     "ENV-FLAVOR-server"
   ],
   "properties": []
-}
\ No newline at end of file
+}
diff --git a/needles/anaconda_install_user_creation_screen.json b/needles/anaconda_install_user_creation_screen.json
index 31c94cc3..73dd60a3 100644
--- a/needles/anaconda_install_user_creation_screen.json
+++ b/needles/anaconda_install_user_creation_screen.json
@@ -8,18 +8,25 @@
   ],
   "area": [
     {
-      "xpos": 4,
-      "ypos": 7,
-      "width": 107,
-      "height": 20,
+      "xpos": 269,
+      "ypos": 156,
+      "width": 69,
+      "height": 17,
       "type": "match"
     },
     {
-      "xpos": 6,
+      "xpos": 277,
+      "ypos": 289,
+      "width": 62,
+      "height": 17,
+      "type": "match"
+    },
+    {
+      "xpos": 7,
       "ypos": 47,
-      "width": 66,
-      "height": 33,
+      "width": 63,
+      "height": 29,
       "type": "match"
     }
   ]
-}
\ No newline at end of file
+}