Commit 22567eda authored by Harald Sitter's avatar Harald Sitter 🏡

update cala tests to no longer expect the summary step

summary has been kicked to the bucket in calamares-settings
parent c71341ce
{
"area": [
{
"height": 30,
"match": 95,
"type": "match",
"width": 168,
"xpos": 193,
"ypos": 311
},
{
"height": 34,
"match": 95,
"type": "match",
"width": 192,
"xpos": 192,
"ypos": 197
},
{
"height": 136,
"match": 95,
"type": "match",
"width": 668,
"xpos": 192,
"ypos": 38
}
],
"properties": [],
"tags": [
"calamares-installer-summary-flexible"
]
}
{
"area": [
{
"height": 62,
"match": 95,
"type": "match",
"width": 168,
"xpos": 193,
"ypos": 306
},
{
"height": 20,
"match": 95,
"type": "match",
"width": 128,
"xpos": 484,
"ypos": 346
},
{
"height": 264,
"match": 95,
"type": "match",
"width": 668,
"xpos": 193,
"ypos": 34
}
],
"properties": [],
"tags": [
"calamares-installer-summary",
"calamares-installer-summary-offline",
"ENV-OFFLINE"
]
}
{
"area": [
{
"height": 62,
"match": 95,
"type": "match",
"width": 168,
"xpos": 193,
"ypos": 306
},
{
"height": 20,
"match": 95,
"type": "match",
"width": 71,
"xpos": 395,
"ypos": 354
},
{
"height": 264,
"match": 95,
"type": "match",
"width": 668,
"xpos": 193,
"ypos": 34
}
],
"properties": [],
"tags": [
"calamares-installer-summary"
]
}
...@@ -76,9 +76,6 @@ sub run { ...@@ -76,9 +76,6 @@ sub run {
type_string get_var("OEM_PASSWORD"); type_string get_var("OEM_PASSWORD");
# all fields filled (not matching hostname field) # all fields filled (not matching hostname field)
assert_screen "calamares-oem-user-complete", 16; assert_screen "calamares-oem-user-complete", 16;
assert_and_click "calamares-installer-next";
assert_screen "calamares-installer-summary", 16;
assert_and_click "calamares-installer-install"; assert_and_click "calamares-installer-install";
assert_screen "calamares-installer-show", 16; assert_screen "calamares-installer-show", 16;
......
...@@ -43,11 +43,6 @@ sub cala_keyboard { ...@@ -43,11 +43,6 @@ sub cala_keyboard {
assert_and_click "calamares-installer-next"; assert_and_click "calamares-installer-next";
} }
sub cala_summary {
assert_screen 'calamares-installer-summary-flexible', 16;
assert_and_click 'calamares-installer-install';
}
sub cala_show { sub cala_show {
assert_screen 'calamares-installer-show', 16; assert_screen 'calamares-installer-show', 16;
} }
...@@ -81,7 +76,7 @@ sub cala_user { ...@@ -81,7 +76,7 @@ sub cala_user {
type_string $password; type_string $password;
# all fields filled (not matching hostname field) # all fields filled (not matching hostname field)
assert_screen 'calamares-installer-user-complete', 16; assert_screen 'calamares-installer-user-complete', 16;
assert_and_click 'calamares-installer-next'; assert_and_click 'calamares-installer-install';
} }
sub run_partioning { sub run_partioning {
...@@ -97,7 +92,6 @@ sub run_partioning { ...@@ -97,7 +92,6 @@ sub run_partioning {
$code->(); $code->();
cala_user; cala_user;
cala_summary;
cala_show; cala_show;
cala_close; cala_close;
......
...@@ -88,9 +88,6 @@ sub run { ...@@ -88,9 +88,6 @@ sub run {
type_string $password; type_string $password;
# all fields filled (not matching hostname field) # all fields filled (not matching hostname field)
assert_screen "calamares-installer-user-complete", 16; assert_screen "calamares-installer-user-complete", 16;
assert_and_click "calamares-installer-next";
assert_screen "calamares-installer-summary", 16;
assert_and_click "calamares-installer-install"; assert_and_click "calamares-installer-install";
assert_screen "calamares-installer-show", 16; assert_screen "calamares-installer-show", 16;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment