diff --git a/needles/gnome/apps/apps_run_firefox-20190220.json b/needles/gnome/apps/apps_run_firefox-20190220.json deleted file mode 100644 index 3f042e7e..00000000 --- a/needles/gnome/apps/apps_run_firefox-20190220.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "area": [ - { - "height": 21, - "xpos": 460, - "type": "match", - "ypos": 35, - "width": 108 - } - ], - "properties": [], - "tags": [ - "apps_run_firefox" - ] -} \ No newline at end of file diff --git a/needles/gnome/apps/apps_run_firefox-20190220.png b/needles/gnome/apps/apps_run_firefox-20190220.png deleted file mode 100644 index 7fe71d39..00000000 Binary files a/needles/gnome/apps/apps_run_firefox-20190220.png and /dev/null differ diff --git a/needles/gnome/apps/apps_run_firefox.json b/needles/gnome/apps/apps_run_firefox.json deleted file mode 100644 index 39b9cf3d..00000000 --- a/needles/gnome/apps/apps_run_firefox.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "properties": [], - "tags": [ - "apps_run_firefox" - ], - "area": [ - { - "xpos": 460, - "ypos": 36, - "width": 108, - "height": 21, - "type": "match" - } - ] -} \ No newline at end of file diff --git a/needles/gnome/apps/apps_run_firefox.png b/needles/gnome/apps/apps_run_firefox.png deleted file mode 100644 index 2e7fbbe9..00000000 Binary files a/needles/gnome/apps/apps_run_firefox.png and /dev/null differ diff --git a/needles/kde/apps/firefox_runs.json b/needles/kde/apps/firefox_runs.json deleted file mode 100644 index 973b296d..00000000 --- a/needles/kde/apps/firefox_runs.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "properties": [], - "tags": [ - "firefox_runs" - ], - "area": [ - { - "xpos": 513, - "ypos": 7, - "width": 48, - "height": 17, - "type": "match" - } - ] -} \ No newline at end of file diff --git a/needles/kde/apps/firefox_runs.png b/needles/kde/apps/firefox_runs.png deleted file mode 100644 index 551ea3dc..00000000 Binary files a/needles/kde/apps/firefox_runs.png and /dev/null differ diff --git a/tests/apps_startstop/gnome/firefox.pm b/tests/apps_startstop/gnome/firefox.pm index 27077cd0..16e0b0a8 100644 --- a/tests/apps_startstop/gnome/firefox.pm +++ b/tests/apps_startstop/gnome/firefox.pm @@ -10,8 +10,10 @@ sub run { my $self = shift; # Start the application start_with_launcher('apps_menu_firefox'); - # check that the applicatin is running - assert_screen 'apps_run_firefox'; + # check that the application is running; this needle is from + # needles/firefox, it already existed before the 'apps' tests + # were created + assert_screen 'firefox'; # Close the application, but since Firefox needs special handling # we are not using the common routine, but deal with this individually instead send_key 'alt-f4'; diff --git a/tests/apps_startstop/kde/firefox.pm b/tests/apps_startstop/kde/firefox.pm index 205d82c8..0c4569f5 100644 --- a/tests/apps_startstop/kde/firefox.pm +++ b/tests/apps_startstop/kde/firefox.pm @@ -10,8 +10,10 @@ sub run { # Start the application start_with_launcher('firefox_launch','menu_applications','menu_internet'); - # Check that it is started - assert_screen 'firefox_runs'; + # Check that it is started; this needle is from + # needles/firefox, it already existed before the 'apps' tests + # were created + assert_screen 'firefox'; # Close the application send_key 'alt-f4'; wait_still_screen 2;