Update blueprints to latest annotation changes

simonihmig · simonihmig · commit 52a0014ed6bc · 2018-03-11T12:21:17.000+01:00
diff --git a/blueprints/feature-index.js b/blueprints/feature-index.js
@@ -1,9 +1,9 @@
 'use strict';
 
 const annotationMap = {
-  acceptance: '@application',
-  integration: '@rendering',
-  unit: '@context'
+  acceptance: '@setupApplicationTest',
+  integration: '@setupRenderingTest',
+  unit: '@setupTest'
 };
 
 module.exports = {
diff --git a/blueprints/mocha/ember-cli-yadda/files/tests/helpers/yadda-annotations.js b/blueprints/mocha/ember-cli-yadda/files/tests/helpers/yadda-annotations.js
@@ -60,13 +60,13 @@ function setupScenario(featureAnnotations, scenarioAnnotations) {
 }
 
 function setupYaddaTest(annotations) {
-  if (annotations.application) {
+  if (annotations.setupapplicationtest) {
     return setupApplicationTest;
   }
-  if (annotations.rendering) {
+  if (annotations.setuprenderingtest) {
     return setupRenderingTest;
   }
-  if (annotations.context) {
+  if (annotations.setuptest) {
     return setupTest;
   }
 }
diff --git a/blueprints/qunit/ember-cli-yadda/files/tests/helpers/yadda-annotations.js b/blueprints/qunit/ember-cli-yadda/files/tests/helpers/yadda-annotations.js
@@ -60,13 +60,13 @@ function setupScenario(featureAnnotations, scenarioAnnotations) {
 }
 
 function setupYaddaTest(annotations) {
-  if (annotations.application) {
+  if (annotations.setupapplicationtest) {
     return setupApplicationTest;
   }
-  if (annotations.rendering) {
+  if (annotations.setuprenderingtest) {
     return setupRenderingTest;
   }
-  if (annotations.context) {
+  if (annotations.setuptest) {
     return setupTest;
   }
 }
diff --git a/node-tests/fixtures/acceptance/foo.feature b/node-tests/fixtures/acceptance/foo.feature
@@ -1,4 +1,4 @@
-@application
+@setupApplicationTest
 Feature: foo
 
   Scenario: the one where I type ember g feature
diff --git a/node-tests/fixtures/integration/foo.feature b/node-tests/fixtures/integration/foo.feature
@@ -1,4 +1,4 @@
-@rendering
+@setupRenderingTest
 Feature: foo
 
   Scenario: the one where I type ember g feature
diff --git a/node-tests/fixtures/main/mocha/helpers/yadda-annotations.js b/node-tests/fixtures/main/mocha/helpers/yadda-annotations.js
@@ -60,13 +60,13 @@ function setupScenario(featureAnnotations, scenarioAnnotations) {
 }
 
 function setupYaddaTest(annotations) {
-  if (annotations.application) {
+  if (annotations.setupapplicationtest) {
     return setupApplicationTest;
   }
-  if (annotations.rendering) {
+  if (annotations.setuprenderingtest) {
     return setupRenderingTest;
   }
-  if (annotations.context) {
+  if (annotations.setuptest) {
     return setupTest;
   }
 }
diff --git a/node-tests/fixtures/main/qunit/helpers/yadda-annotations.js b/node-tests/fixtures/main/qunit/helpers/yadda-annotations.js
@@ -60,13 +60,13 @@ function setupScenario(featureAnnotations, scenarioAnnotations) {
 }
 
 function setupYaddaTest(annotations) {
-  if (annotations.application) {
+  if (annotations.setupapplicationtest) {
     return setupApplicationTest;
   }
-  if (annotations.rendering) {
+  if (annotations.setuprenderingtest) {
     return setupRenderingTest;
   }
-  if (annotations.context) {
+  if (annotations.setuptest) {
     return setupTest;
   }
 }
diff --git a/node-tests/fixtures/unit/foo.feature b/node-tests/fixtures/unit/foo.feature
@@ -1,4 +1,4 @@
-@context
+@setupTest
 Feature: foo
 
   Scenario: the one where I type ember g feature

Original file line number	Diff line number	Diff line change
`@@ -60,13 +60,13 @@ function setupScenario(featureAnnotations, scenarioAnnotations) {`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`function setupYaddaTest(annotations) {`
`63`		`- if (annotations.application) {`
	`63`	`+ if (annotations.setupapplicationtest) {`
`64`	`64`	`return setupApplicationTest;`
`65`	`65`	`}`
`66`		`- if (annotations.rendering) {`
	`66`	`+ if (annotations.setuprenderingtest) {`
`67`	`67`	`return setupRenderingTest;`
`68`	`68`	`}`
`69`		`- if (annotations.context) {`
	`69`	`+ if (annotations.setuptest) {`
`70`	`70`	`return setupTest;`
`71`	`71`	`}`
`72`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-@application`
	`1`	`+@setupApplicationTest`
`2`	`2`	`Feature: foo`
`3`	`3`
`4`	`4`	`Scenario: the one where I type ember g feature`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-@rendering`
	`1`	`+@setupRenderingTest`
`2`	`2`	`Feature: foo`
`3`	`3`
`4`	`4`	`Scenario: the one where I type ember g feature`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-@context`
	`1`	`+@setupTest`
`2`	`2`	`Feature: foo`
`3`	`3`
`4`	`4`	`Scenario: the one where I type ember g feature`