Merge branch 'master' into preview

mfqh00 · Nov 10, 2022 · c7f0ff9 · c7f0ff9
2 parents d16ceb9 + 657a778
commit c7f0ff9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/app/services/onboarding.ts b/app/services/onboarding.ts
@@ -196,9 +196,9 @@ class OnboardingViews extends ViewHandler<IOnboardingServiceState> {
       steps.push(ONBOARDING_STEPS()[EOnboardingSteps.Optimize]);
     }
 
-    // if (userViews.isLoggedIn && !userViews.isPrime) {
-    //   steps.push(ONBOARDING_STEPS()[EOnboardingSteps.Prime]);
-    // }
+    if (userViews.isLoggedIn && !userViews.isPrime) {
+      steps.push(ONBOARDING_STEPS()[EOnboardingSteps.Prime]);
+    }
 
     return steps;
   }

diff --git a/test/regular/obs-importer.ts b/test/regular/obs-importer.ts
@@ -59,7 +59,7 @@ test('OBS Importer', async t => {
 
   await waitForDisplayed('h1=Optimize');
   await (await t.context.app.client.$('button=Skip')).click();
-  // await (await t.context.app.client.$('div=Choose Free')).click();
+  await (await t.context.app.client.$('div=Choose Free')).click();
 
   await waitForDisplayed('[data-name=SceneSelector]');
 

diff --git a/test/regular/onboarding.ts b/test/regular/onboarding.ts
@@ -46,12 +46,12 @@ test('Go through the onboarding and autoconfig', async t => {
   t.true(await (await app.client.$('button=Start')).isExisting());
   await (await app.client.$('button=Start')).click();
 
-  // await (await t.context.app.client.$('div=Choose Free')).waitForDisplayed({ timeout: 60000 });
+  await (await t.context.app.client.$('div=Choose Free')).waitForDisplayed({ timeout: 60000 });
   // Skip purchasing prime
-  // if (await (await t.context.app.client.$('div=Choose Free')).isExisting()) {
-  //   await (await t.context.app.client.$('div=Choose Free')).click();
-  //   await sleep(1000);
-  // }
+  if (await (await t.context.app.client.$('div=Choose Free')).isExisting()) {
+    await (await t.context.app.client.$('div=Choose Free')).click();
+    await sleep(1000);
+  }
 
   await (await app.client.$('span=Sources')).waitForDisplayed({ timeout: 60000 });
   // success?