nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixing tests related to leveling

Browse source
This commit is contained in:
Lars Brubaker 2018-04-05 16:16:43 -07:00
parent 6b62a22b4b
commit 28ffed0908
4 changed files with 18 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

16
StaticData/SliceSettings/Properties.json
View file

@ -78,14 +78,6 @@
"ShowIfSet": "!sla_printer",
"DefaultValue": "100%"
},
{
"SlicerConfigName": "clean_nozzle_image",
"PresentationName": "Clean Nozzle Image",
"HelpText": "The image to show when explaining leveling and calibration.",
"DataEditType": "WIDE_STRING",
"ShowIfSet": "!sla_printer",
"DefaultValue": "clean_nozzle.png"
},
{
"SlicerConfigName": "trim_image",
"PresentationName": "Trim Image",
@ -777,6 +769,14 @@
"DefaultValue": "3 Point Plane",
"RebuildGCodeOnChange": false
},
{
"SlicerConfigName": "clean_nozzle_image",
"PresentationName": "Clean Nozzle Image",
"HelpText": "The image to show when explaining leveling and calibration.",
"DataEditType": "WIDE_STRING",
"ShowIfSet": "!has_hardware_leveling",
"DefaultValue": "clean_nozzle.png"
},
{
"SlicerConfigName": "print_leveling_required_to_print",
"PresentationName": "Require Leveling To Print",

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit 285336bfd56a2d3fd6d8d05d4547177e752b5c98
Subproject commit ebb914d6bdc045cbb3f5a09ddc0c714d995c85e1

5
Tests/MatterControl.AutomationTests/HardwareLevelingUITests.cs
View file

@ -21,7 +21,8 @@ namespace MatterHackers.MatterControl.Tests.Automation
testRunner.SwitchToPrinterSettings();
testRunner.ClickByName("Features Tab");
testRunner.NavigateToSliceSettingsField("Printer", SettingsKey.sla_printer);
testRunner.ClickByName("Slice Settings Overflow Menu");
testRunner.ClickByName("Expand All Menu Item");
Assert.IsFalse(testRunner.WaitForName("print_leveling_solution Row", .5), "Print leveling should not exist for an Airwolf HD");
// Add printer that does not have hardware leveling
@ -29,6 +30,8 @@ namespace MatterHackers.MatterControl.Tests.Automation
testRunner.SwitchToPrinterSettings();
testRunner.ClickByName("Features Tab");
testRunner.ClickByName("Slice Settings Overflow Menu");
testRunner.ClickByName("Expand All Menu Item");
Assert.IsTrue(testRunner.WaitForName("print_leveling_solution Row"), "Print leveling should exist for a 3D Factory MendelMax");
return Task.CompletedTask;

7
Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs
View file

@ -763,8 +763,11 @@ namespace MatterHackers.MatterControl.Tests.Automation
{
testRunner.SwitchToSliceSettings();
testRunner.ClickByName("Printer Overflow Menu");
testRunner.ClickByName("Configure Printer Menu Item");
if (!testRunner.NameExists("Printer Tab"))
{
testRunner.ClickByName("Printer Overflow Menu");
testRunner.ClickByName("Configure Printer Menu Item");
}
testRunner.ClickByName("Printer Tab");
}