@@ -31,6 +31,7 @@ import Unity.Indicators 0.1
3131import Unity.Notifications 1.0
3232import Unity.Test 0.1 as UT
3333import Powerd 0.1
34+import Wizard 0.1 as Wizard
3435
3536import "../../qml"
3637
@@ -202,10 +203,22 @@ Item {
202203 tryCompare(shell, "enabled", true); // make sure greeter didn't leave us in disabled state
203204 launcherShowDashHomeSpy.target = null;
204205
205− shellLoader.itemDestroyed = false;
206+ stopShell();
206207
207− shellLoader.active = false;
208+ // kill all (fake) running apps
209+ killApps(ApplicationManager);
210+
211+ unlockAllModemsSpy.clear()
212+ LightDM.Greeter.authenticate(""); // reset greeter
213+ Wizard.System.wizardEnabled = false;
208214
215+ // reload our test subject to get it in a fresh state once again
216+ startShell();
217+ }
218+
219+ function stopShell() {
220+ shellLoader.itemDestroyed = false;
221+ shellLoader.active = false;
209222 tryCompare(shellLoader, "status", Loader.Null);
210223 tryCompare(shellLoader, "item", null);
211224 // Loader.status might be Loader.Null and Loader.item might be null but the Loader
@@ -215,16 +228,10 @@ Item {
215228 // iteration to do its work. So to ensure the reload, we will wait until the
216229 // Shell instance gets destroyed.
217230 tryCompare(shellLoader, "itemDestroyed", true);
231+ }
218232
219− // kill all (fake) running apps
220− killApps(ApplicationManager);
221−
222− unlockAllModemsSpy.clear()
223− LightDM.Greeter.authenticate(""); // reset greeter
224−
225− // reload our test subject to get it in a fresh state once again
233+ function startShell() {
226234 shellLoader.active = true;
227−
228235 tryCompare(shellLoader, "status", Loader.Ready);
229236 removeTimeConstraintsFromDirectionalDragAreas(shellLoader.item);
230237 }
@@ -725,6 +732,25 @@ Item {
725732 tryCompare(unlockAllModemsSpy, "count", 1)
726733 }
727734
735+ function test_unlockAllModemsAfterWizard() {
736+ // Stop and start shell to simulate wizard being enabled during
737+ // boot, instead of just being enabled after the fact.
738+ stopShell();
739+ Wizard.System.wizardEnabled = true;
740+ unlockAllModemsSpy.clear();
741+ startShell();
742+
743+ var wizard = findChild(shell, "wizard");
744+ compare(wizard.active, true);
745+ compare(Wizard.System.wizardEnabled, true);
746+ compare(unlockAllModemsSpy.count, 0);
747+
748+ wizard.hide();
749+ tryCompare(wizard, "active", false);
750+ compare(Wizard.System.wizardEnabled, false);
751+ compare(unlockAllModemsSpy.count, 1);
752+ }
753+
728754 function test_tapOnRightEdgeReachesApplicationSurface() {
729755 var topmostSpreadDelegate = findChild(shell, "appDelegate0");
730756 var topmostSurface = findChild(topmostSpreadDelegate, "surfaceContainer").surface;