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

Merge pull request #602 from gregory-diaz/1.5.1

Browse source 
Fixed a broken unittest and fixed a bug that was not allowing us to a…
This commit is contained in:
Lars Brubaker 2016-03-07 17:35:49 -08:00
commit cdba47516f
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
SettingsManagement/ApplicationSettings.cs
View file

@ -9,7 +9,7 @@ namespace MatterHackers.MatterControl
public static string OpenPrintableFileParams { get { return "STL, AMF, ZIP, GCODE|*.stl;*.amf;*.zip;*.gcode"; } }
public static string OpenDesignFileParams { get { return "STL, AMF, ZIP|*.stl;*.amf;*.zip"; } }
public static string OpenDesignFileParams { get { return "STL, AMF, ZIP|*.stl;*.amf;*.zip;*.gcode"; } }
private static ApplicationSettings globalInstance = null;
public Dictionary<string, DataStorage.SystemSetting> settingsDictionary;

2
Tests/MatterControl.AutomationTests/PrintQueueTests.cs
View file

@ -142,7 +142,7 @@ namespace MatterHackers.MatterControl.UI
bool exportWindowExists1 = testRunner.WaitForName( "Export Item Window", 0);
resultsHarness.AddTestResult(exportWindowExists1 == false, "Export window does not exist");
testRunner.ClickByName("Export Queue Button", 5);
testRunner.ClickByName("Queue Export Button", 5);
SystemWindow containingWindow;
GuiWidget exportWindow = testRunner.GetWidgetByName("Export Item Window", out containingWindow, 5);
resultsHarness.AddTestResult(exportWindow != null, "Export window does exist");