Merge pull request #501 from ro0gr/forward-fallback-to-acceptance

Forward to master "Fallback to acceptance tests"
san650 · Apr 20, 2020 · c2d1a6f · c2d1a6f
2 parents ac654b0 + 817fedd
commit c2d1a6f
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/addon-test-support/-private/execution_context.js b/addon-test-support/-private/execution_context.js
@@ -28,13 +28,11 @@ export function getExecutionContext(pageObjectNode) {
   let contextName;
   if (integrationTestContext) {
     contextName = 'integration';
-  } else if (isAcceptanceTest()) {
-    contextName = 'acceptance';
   } else if (supportsRfc268()) {
     contextName = 'rfc268';
-  }
-
-  if (!contextName) {
+  } else if (isAcceptanceTest()) {
+    contextName = 'acceptance';
+  } else {
     throw new Error(`Looks like you attempt to access page object property outside of test context.
 If that's not the case, please make sure you use the latest version of "@ember/test-helpers".`);
   }