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

Merge branch '1.6'

Browse source 
# Conflicts:
#	SlicerConfiguration/Settings/ProfileManager.cs
#	Tests/MatterControl.AutomationTests/PrintQueueTests.cs
#	Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs
This commit is contained in:
Lars Brubaker 2016-12-07 16:14:56 -08:00
commit dbd2c20398
5 changed files with 75 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -258,6 +258,10 @@ namespace MatterHackers.MatterControl.Tests.Automation
testRunner.ClickByName(model + " Menu Item", 5, delayBeforeReturn: .5);
testRunner.ClickByName("Save & Continue Button", 5, delayBeforeReturn: 1); // wait for this window to close
// An unpredictable period of time will pass between Clicking Save, everything reloading and us returning to the caller.
// Block until ReloadAll has completed then close and return to the caller, at which point hopefully everything is reloaded.
WaitForReloadAll(testRunner, () => testRunner.ClickByName("Save & Continue Button", 2));
testRunner.ClickByName("Cancel Wizard Button", 5, delayBeforeReturn: .5);
testRunner.Wait(1);
}