83ff7a0
4288041
e72a800
c97c23d
@@ -0,0 +1,15 @@
+ {
+ "area": [
+ "type": "match",
+ "ypos": 300,
+ "height": 30,
+ "xpos": 212,
+ "width": 42
+ }
+ ],
+ "properties": [],
+ "tags": [
+ "apps_menu_archiver"
+ ]
\ No newline at end of file
@@ -1,15 +1,15 @@
- {
- "properties": [],
- "tags": [
- "apps_run_evolution"
- ],
- "area": [
- "xpos": 402,
- "ypos": 87,
- "width": 68,
- "height": 18,
- "type": "match"
- }
- ]
+ "ypos": 167,
+ "width": 30,
+ "xpos": 773,
+ "height": 31
+ "apps_menu_contacts"
}
{
- "apps_run_evolution_warning"
"area": [
- "xpos": 688,
- "ypos": 644,
+ "xpos": 209,
+ "ypos": 457,
"width": 32,
- "height": 19,
+ "height": 24,
"type": "match"
+ "apps_menu_dviewer"
]
- "apps_menu_evolution"
- "xpos": 621,
- "ypos": 313,
- "width": 47,
- "height": 33,
+ "width": 50,
+ "xpos": 626,
+ "height": 36,
+ "ypos": 445,
+ "type": "match"
+ "apps_menu_imageviewer"
@@ -1,11 +1,11 @@
- "ypos": 155,
+ "height": 95,
+ "xpos": 754,
"width": 77,
- "type": "match",
- "height": 88,
- "xpos": 475
+ "ypos": 570,
],
"properties": [],
@@ -8,7 +8,7 @@
"xpos": 447,
"ypos": 41,
"width": 133,
- "height": 23,
+ "height": 21,
@@ -5,9 +5,9 @@
- "xpos": 117,
- "ypos": 4,
- "width": 117,
+ "xpos": 452,
+ "ypos": 110,
+ "width": 118,
"height": 23,
@@ -5,10 +5,10 @@
- "xpos": 115,
- "ypos": 5,
+ "xpos": 517,
+ "ypos": 532,
+ "width": 113,
+ "height": 20,
- "width": 72,
- "height": 22,
+ "xpos": 424,
+ "ypos": 515,
+ "width": 20,
+ "height": 17,
- "xpos": 114,
- "width": 66,
- "height": 20,
+ "xpos": 612,
+ "ypos": 42,
+ "width": 42,
+ "height": 19,
- "width": 79,
+ "xpos": 195,
+ "ypos": 627,
+ "width": 126,
"height": 21,
- "xpos": 116,
- "width": 52,
+ "xpos": 467,
+ "ypos": 41,
+ "width": 94,
- "height": 17,
- "width": 49,
- "apps_run_clocks"
+ "xpos": 488,
+ "ypos": 382,
+ "width": 52,
+ "height": 50,
+ "apps_run_clocks"
- "width": 112,
+ "xpos": 457,
+ "ypos": 71,
+ "width": 65,
- "width": 42,
+ "xpos": 256,
+ "ypos": 139,
+ "width": 82,
+ "height": 22,
- "ypos": 6,
- "width": 80,
+ "xpos": 445,
+ "ypos": 40,
+ "width": 138,
- "width": 83,
+ "xpos": 412,
+ "ypos": 39,
+ "width": 79,
+ "height": 23,
- "width": 127,
+ "xpos": 446,
+ "width": 132,
- "width": 37,
+ "xpos": 157,
+ "ypos": 87,
+ "width": 67,
- "width": 35,
- "height": 21,
+ "width": 92,
- "width": 96,
+ "xpos": 461,
+ "ypos": 122,
+ "width": 102,
+ "xpos": 573,
+ "ypos": 36,
+ "width": 34,
- "width": 44,
+ "xpos": 52,
+ "width": 23,
- "ypos": 3,
- "width": 107,
- "height": 24,
- "apps_run_monitor"
+ "xpos": 489,
+ "ypos": 141,
+ "width": 51,
+ "apps_run_monitor"
+ "ypos": 86,
"type": "ocr"
- "width": 51,
+ "xpos": 458,
+ "ypos": 338,
+ "width": 111,
+ "height": 89,
- "width": 82,
+ "xpos": 128,
+ "ypos": 98,
+ "width": 115,
- "width": 62,
+ "xpos": 104,
+ "width": 61,
- "ypos": 723,
- "xpos": 856,
+ "ypos": 181,
"type": "match",
- "width": 56
+ "xpos": 9,
+ "width": 189
"tags": [
- "apps_run_evolution_welcome"
- "properties": []
+ "apps_run_software"
+ "xpos": 345,
+ "ypos": 150,
"width": 66,
- "width": 81,
+ "xpos": 501,
+ "width": 71,
+ "xpos": 440,
+ "ypos": 43,
"width": 51,
- "width": 56,
+ "xpos": 156,
+ "ypos": 107,
+ "apps_run_weather"
+ "xpos": 386,
+ "ypos": 401,
+ "width": 56,
+ "height": 18,
@@ -9,7 +9,7 @@
my $self = shift;
# Start the application
- start_with_launcher('apps_menu_calculator');
+ start_with_launcher('apps_menu_calculator', 'apps_menu_utilities');
# Check that it is started
assert_screen 'apps_run_calculator';
# Close the application
sub run {
- start_with_launcher('apps_menu_dviewer');
+ start_with_launcher('apps_menu_dviewer', 'apps_menu_utilities');
# Check that is started
assert_screen 'apps_run_dviewer';
@@ -1,30 +0,0 @@
- use base "installedtest";
- use strict;
- use testapi;
- use utils;
-
- # This test checks that Evolution starts.
- sub run {
- my $self = shift;
- # Start the application
- start_with_launcher('apps_menu_evolution');
- # get rid of the welcome screen
- if ('apps_run_evolution_warning') {
- assert_and_click 'apps_run_evolution_warning';
- assert_and_click 'apps_run_evolution_welcome';
- wait_still_screen 2;
- # Check that is started
- assert_screen 'apps_run_evolution';
- # Close the application
- quit_with_shortcut();
- sub test_flags {
- return {always_rollback => 1};
- 1;
- # vim: set sw=4 et:
This patch FIXES #87.
In this PR:
Metadata Update from @lruzicka: - Request assigned
I don't understand why there need to be new variants of needles like 'apps_menu_dviewer', 'apps_menu_archiver' etc. From an eyeball look at least, nothing has changed about the icons for these apps; do the old needles really no longer match?
I do not understand, what you mean exactly. The Archiver has a totally different icon, for example. I am not sure about Document Viewer, it looked a bit more polished to me when I was trying to fix the test case, however now, after a closer look, it perhaps does not differ, so this one needle might not be necessary.
I kept those old needles there for backward compatibility with early stages of Rawhide, when it still resembled the 29 release. When inspecting other tests, I had the notion that for some tags, we also have different needles (usually named with dates).
If the icon has actually changed and the old needle doesn't match any more, it's fine - but I wanted to be clear that's the case. Generally speaking, you only ever need to replace or add a needle if there's a case where it should match, but does not.
We have lots of 'variant' needles indeed, but only where there's a need - where a test started failing because a needle stopped matching, basically. My usual practice is to keep the old needle around at least at first unless we're absolutely sure there'd be no situation where it might be useful. We commonly do actually need more than one variant of a needle at a time, because we use many of them on different releases - there's Branched and Rawhide, then the stable tests that run on stable releases, and the upgrade tests which start out on a stable release (and may need to go through graphical login).
I then usually go through the needles once a year and clean up old ones that we are no longer using (there are some features that help with this in the admin UI).
So, basically, I just want to be clear that there's a specific need for the new needles - that the test fails on Rawhide with the old needles.
Oh, also, arguably the 'add new needles' change should be a separate commit from the 'fix for removal of app menu' change, since they're not really the same thing at all, I think...
Oh, I did not know that in this situation two commits are better than one. Usually, you want me to squash the commits. I thought that the task was to make that test work again and when I was changing the needles to match different spots in the applications, I realized there were like two or three bad needles which needed to be recreated for the test to work, so I did it in one batch.
With this test, we will have to recreate most of the needles in near future anyway, when they change the icons for more modern ones.
I will check, if the old Documents Viewer needle works ... if so I will delete the new one, but otherwise I believe that the addition was needed.
So the general rule for commits is that each change that kinda 'stands alone' should be a single commit. If you're basically trying to do one thing - like "add a new test for X" - but along the way we go through review and find bugs and you do a series of commits like "fix stupid typo in X test", "fix missing file in X test", blah blah - there's no sense keeping all those 'fixup' commits, so we should just squash them down.
But if you want to add an X test, and also add a Y test, and along the way you notice an unrelated bug in Z and want to fix that too - that's three separate commits. :)
rebased onto 5577510f189974ae6870efb70f9233a23987353f
rebased onto c97c23d
As discussed in person - please drop Evolution needles as well as test, and rename _f30 needles to -f30 or (I prefer) -20190128 or so.
_f30
-f30
-20190128
1 new commit added
Rename files as requested.
Delete Evolution needles.
4 new commits added
Use the current date instead f30 as a filename for new needles.
Add new needles.
Recreate needles to make them check different area.
Clocks failed - I'm guessing the screen the needle is based on only shows up if the app cannot geolocate and create a default clock, or something. Maybe match on the button bar at the top of the app as that's consistent whichever initial screen appears. Other than that, though, this seems to work fine, so let's go ahead and merge it as it's much better than what's there right now, and you can fix clocks as a follow-up. Thanks!
Pull-Request has been merged by adamwill
I have updated the needle target on master branch. Since it was an easy fix, I think that an extra pull request was not necessary.
This patch FIXES #87.