Use the existing 'oh hai this is firefox' needle for app tests
The KDE and GNOME 'apps' tests for Firefox both invented their own 'oh look Firefox is running' needle, even though we already had one. The GNOME one was broken by the removal of the app title bar in Firefox 66. Instead of having three needles for the same thing, let's just throw the 'apps' ones out and use the pre-existing one from needles/firefox for all cases. Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
parent
846c2969a4
commit
5a1a71c67f
@ -1,15 +0,0 @@
|
|||||||
{
|
|
||||||
"area": [
|
|
||||||
{
|
|
||||||
"height": 21,
|
|
||||||
"xpos": 460,
|
|
||||||
"type": "match",
|
|
||||||
"ypos": 35,
|
|
||||||
"width": 108
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"properties": [],
|
|
||||||
"tags": [
|
|
||||||
"apps_run_firefox"
|
|
||||||
]
|
|
||||||
}
|
|
Binary file not shown.
Before Width: | Height: | Size: 149 KiB |
@ -1,15 +0,0 @@
|
|||||||
{
|
|
||||||
"properties": [],
|
|
||||||
"tags": [
|
|
||||||
"apps_run_firefox"
|
|
||||||
],
|
|
||||||
"area": [
|
|
||||||
{
|
|
||||||
"xpos": 460,
|
|
||||||
"ypos": 36,
|
|
||||||
"width": 108,
|
|
||||||
"height": 21,
|
|
||||||
"type": "match"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
Binary file not shown.
Before Width: | Height: | Size: 164 KiB |
@ -1,15 +0,0 @@
|
|||||||
{
|
|
||||||
"properties": [],
|
|
||||||
"tags": [
|
|
||||||
"firefox_runs"
|
|
||||||
],
|
|
||||||
"area": [
|
|
||||||
{
|
|
||||||
"xpos": 513,
|
|
||||||
"ypos": 7,
|
|
||||||
"width": 48,
|
|
||||||
"height": 17,
|
|
||||||
"type": "match"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
Binary file not shown.
Before Width: | Height: | Size: 168 KiB |
@ -10,8 +10,10 @@ sub run {
|
|||||||
my $self = shift;
|
my $self = shift;
|
||||||
# Start the application
|
# Start the application
|
||||||
start_with_launcher('apps_menu_firefox');
|
start_with_launcher('apps_menu_firefox');
|
||||||
# check that the applicatin is running
|
# check that the application is running; this needle is from
|
||||||
assert_screen 'apps_run_firefox';
|
# needles/firefox, it already existed before the 'apps' tests
|
||||||
|
# were created
|
||||||
|
assert_screen 'firefox';
|
||||||
# Close the application, but since Firefox needs special handling
|
# Close the application, but since Firefox needs special handling
|
||||||
# we are not using the common routine, but deal with this individually instead
|
# we are not using the common routine, but deal with this individually instead
|
||||||
send_key 'alt-f4';
|
send_key 'alt-f4';
|
||||||
|
@ -10,8 +10,10 @@ sub run {
|
|||||||
|
|
||||||
# Start the application
|
# Start the application
|
||||||
start_with_launcher('firefox_launch','menu_applications','menu_internet');
|
start_with_launcher('firefox_launch','menu_applications','menu_internet');
|
||||||
# Check that it is started
|
# Check that it is started; this needle is from
|
||||||
assert_screen 'firefox_runs';
|
# needles/firefox, it already existed before the 'apps' tests
|
||||||
|
# were created
|
||||||
|
assert_screen 'firefox';
|
||||||
# Close the application
|
# Close the application
|
||||||
send_key 'alt-f4';
|
send_key 'alt-f4';
|
||||||
wait_still_screen 2;
|
wait_still_screen 2;
|
||||||
|
Loading…
Reference in New Issue
Block a user