diff --git a/neon/needles/plasma_folder/plasma-folder-config-folder-background-color.json b/neon/needles/plasma_folder/plasma-folder-config-background-color.json similarity index 80% rename from neon/needles/plasma_folder/plasma-folder-config-folder-background-color.json rename to neon/needles/plasma_folder/plasma-folder-config-background-color.json index c2666b5..7fc4211 100644 --- a/neon/needles/plasma_folder/plasma-folder-config-folder-background-color.json +++ b/neon/needles/plasma_folder/plasma-folder-config-background-color.json @@ -1,17 +1,17 @@ { "area": [ { "height": 22, "match": 95, "type": "match", "width": 230, "xpos": 270, "ypos": 123 } ], "properties": [], "tags": [ - "plasma-folder-config-folder-background" + "plasma-folder-config-background-color" ] } diff --git a/neon/needles/plasma_folder/plasma-folder-config-folder-background-color.png b/neon/needles/plasma_folder/plasma-folder-config-background-color.png similarity index 100% rename from neon/needles/plasma_folder/plasma-folder-config-folder-background-color.png rename to neon/needles/plasma_folder/plasma-folder-config-background-color.png diff --git a/neon/needles/plasma_folder/plasma-folder-config-folder-background.json b/neon/needles/plasma_folder/plasma-folder-config-background.json similarity index 51% rename from neon/needles/plasma_folder/plasma-folder-config-folder-background.json rename to neon/needles/plasma_folder/plasma-folder-config-background.json index 4c014f2..d32568f 100644 --- a/neon/needles/plasma_folder/plasma-folder-config-folder-background.json +++ b/neon/needles/plasma_folder/plasma-folder-config-background.json @@ -1,8 +1,8 @@ { "area": [], "properties": [], "tags": [ - "plasma-folder-config-folder-background-color" + "plasma-folder-config-background" ] } diff --git a/neon/needles/plasma_folder/plasma-folder-config-folder-background.png b/neon/needles/plasma_folder/plasma-folder-config-background.png similarity index 100% rename from neon/needles/plasma_folder/plasma-folder-config-folder-background.png rename to neon/needles/plasma_folder/plasma-folder-config-background.png diff --git a/neon/needles/plasma_folder/plasma-folder-config-folder-color.json b/neon/needles/plasma_folder/plasma-folder-config-folder-color.json index cb712b1..3a3492c 100644 --- a/neon/needles/plasma_folder/plasma-folder-config-folder-color.json +++ b/neon/needles/plasma_folder/plasma-folder-config-folder-color.json @@ -1,17 +1,17 @@ { "area": [ { "height": 22, "match": 95, "type": "match", "width": 112, "xpos": 266, "ypos": 225 } ], "properties": [], "tags": [ - "plasma-folder-config-folder-background-color" + "plasma-folder-config-folder-color" ] } diff --git a/neon/needles/plasma_lockscreen/plasma-locked-idle-wallpaper.json b/neon/needles/plasma_lockscreen/plasma-locked-idle-wallpaper.json index 993e96e..b3fc359 100644 --- a/neon/needles/plasma_lockscreen/plasma-locked-idle-wallpaper.json +++ b/neon/needles/plasma_lockscreen/plasma-locked-idle-wallpaper.json @@ -1,20 +1,20 @@ { "area": [ { "height": 353, "match": 95, "type": "match", "width": 1024, "xpos": 0, "ypos": 414 } ], - "properties": [ - - ], + "properties": [], "tags": [ "plasma-locked-idle", "plasma-locked", - "ENV-TYPE-devedition-gitunstable" + "ENV-TYPE-devedition-gitunstable", + "plasma-locked-idle-wallpaper" ] } + diff --git a/neon/tests/plasma/plasma_folder.pm b/neon/tests/plasma/plasma_folder.pm index b08d74c..18aa114 100644 --- a/neon/tests/plasma/plasma_folder.pm +++ b/neon/tests/plasma/plasma_folder.pm @@ -1,73 +1,73 @@ # Copyright (C) 2016-2018 Harald Sitter # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License as # published by the Free Software Foundation; either version 2 of # the License or (at your option) version 3 or any later version # accepted by the membership of KDE e.V. (or its successor approved # by the membership of KDE e.V.), which shall act as a proxy # defined in Section 14 of version 3 of the license. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program. If not, see . use base "basetest_neon"; use strict; use testapi; sub run { my ($self) = @_; $self->boot; # We are now logged in... # wait for the desktop to appear # Technically we'd want to make sure the desktop appears in under 30s but # since we can't make sure that is in fact the baseline we can't really do # that :/ # >30s would be indicative of a dbus timeout. assert_screen 'folder-desktop', 30; # 5.12 is the last version to have standard icons on desktop. So, only check # for them there. if (match_has_tag('folder-desktop-512')) { assert_and_click "home-icon"; assert_screen 'dolphin', 10; send_key 'alt-f4'; assert_screen 'folder-desktop', 8; } # While unstable installs are still on older plasmas this can be a soft # failure, should become hard in April 2018 if I remember. if ($ENV{TYPE} eq 'devedition-gitunstable' && match_has_tag('folder-desktop-512')) { record_soft_failure "Screen had Plasma 5.12 icons but unstable should't have them!" } # TODO: move to first_start.pm # we'd assert the wallpaper once and then switch to static color only mouse_set 400, 300; mouse_click 'right'; assert_and_click 'plasma-context-config-folder'; - assert_and_click 'plasma-folder-config-folder-background'; - assert_and_click 'plasma-folder-config-folder-background-color'; + assert_and_click 'plasma-folder-config-background'; + assert_and_click 'plasma-folder-config-background-color'; # Should the deafault ever become undesirable: #1d99f3 is the lovely color. assert_and_click 'kcm-ok'; # Should now be lovely blue. assert_screen 'folder-desktop-color'; } sub test_flags { # without anything - rollback to 'lastgood' snapshot if failed # 'fatal' - whole test suite is in danger if this fails # 'milestone' - after this test succeeds, update 'lastgood' # 'important' - if this fails, set the overall state to 'fail' return { important => 1 }; } 1;