Merge pull request #758 from Turbo87/params

Remove deprecated `TransformTestSelectorParamsToHashPairs` transform

index.js

@@ -30,16 +30,16 @@ module.exports = {
   },
 
   _setupPreprocessorRegistry(registry) {
-    let pluginFnName = this._stripTestSelectors ? '_buildStripPlugin' : '_buildHashParamPlugin';
-
-    let plugin = this[pluginFnName]();
-    plugin.parallelBabel = {
-      requireFile: __filename,
-      buildUsing: pluginFnName,
-      params: {},
-    };
-
-    registry.add('htmlbars-ast-plugin', plugin);
+    if (this._stripTestSelectors) {
+      let plugin = this._buildStripPlugin();
+      plugin.parallelBabel = {
+        requireFile: __filename,
+        buildUsing: '_buildStripPlugin',
+        params: {},
+      };
+
+      registry.add('htmlbars-ast-plugin', plugin);
+    }
   },
 
   included(appOrParent) {
@@ -119,15 +119,4 @@ module.exports = {
       cacheKey: StripTestSelectorsTransform.cacheKey,
     };
   },
-
-  _buildHashParamPlugin() {
-    let TransformTestSelectorParamsToHashPairs = require('./transform-test-selector-params-to-hash-pairs');
-
-    return {
-      name: 'transform-test-selector-params-to-hash-pairs',
-      plugin: TransformTestSelectorParamsToHashPairs,
-      baseDir: TransformTestSelectorParamsToHashPairs.baseDir,
-      cacheKey: TransformTestSelectorParamsToHashPairs.cacheKey,
-    };
-  },
 };

tests/acceptance/bind-data-test-attributes-in-components-test.js

@@ -1,9 +1,8 @@
-import { module, test, skip } from 'qunit';
+import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
 import { visit } from '@ember/test-helpers';
 
 import config from 'dummy/config/environment';
-import { hasPositionalParams } from 'dummy/version-checks';
 
 if (!config.stripTestSelectors) {
 
@@ -54,22 +53,6 @@ if (!config.stripTestSelectors) {
       assert.dom('.test7 div[data-test-with-boolean-value]').exists('data-test-with-boolean-value exists');
     });
 
-    test('it binds data-test-* attributes without values on components', function(assert) {
-      assert.dom('.test8 div[data-test-without-value]').exists('data-test-without-value exists');
-    });
-
-    test('it binds data-test-* attributes without values on block components', function(assert) {
-      assert.dom('.test9 div[data-test-without-value]').exists('data-test-without-value exists');
-    });
-
-    (hasPositionalParams ? test : skip)('it leaves data-test attribute without value untouched on components', function(assert) {
-      assert.dom('.test10 div[data-test]').doesNotExist('data-test does not exists');
-    });
-
-    test('it transforms data-test params to hash pairs on components', function(assert) {
-      assert.dom('.test11 div[data-test-something]').exists('data-test-something exists');
-    });
-
     test('it binds data-test attributes on {{link-to}} components', function(assert) {
       assert.dom('.test-link-to-block a').hasAttribute('data-test-foo', 'bar');
       assert.dom('.test-link-to-inline a').hasAttribute('data-test-foo', 'bar');

tests/dummy/app/templates/bind-test.hbs

@@ -12,16 +12,6 @@
 
 <div class="test7">{{data-test-component data-test-with-boolean-value=true}}</div>
 
-<div class="test8">{{data-test-component data-test-without-value}}</div>
-
-<div class="test9">{{#data-test-component data-test-without-value}}foo{{/data-test-component}}</div>
-
-{{#if hasPositionalParams}}
-  <div class="test10">{{data-test-component data-test}}</div>
-{{/if}}
-
-<div class="test11">{{data-test-component data-test-something some-prop="prop"}}</div>
-
 <div class="test-link-to-block">{{#link-to "index" data-test-foo="bar"}}Label{{/link-to}}</div>
 
 <div class="test-link-to-inline">{{link-to "Label" "index" data-test-foo="bar"}}</div>

tests/integration/strip-data-test-attributes-from-components-test.js

@@ -1,42 +1,14 @@
-import { module, test, skip } from 'qunit';
+import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
 import hbs from 'htmlbars-inline-precompile';
 
 import config from 'dummy/config/environment';
-import {
-  hasReliablePositionalParams,
-  hasEmberVersion
-} from 'dummy/version-checks';
 
 module('StripTestSelectorsTransform plugin', function(hooks) {
   setupRenderingTest(hooks);
 
   if (config.stripTestSelectors) {
-    (hasReliablePositionalParams ? test : skip)('it strips data-test-* attributes from components with single positional params', async function(assert) {
-      await render(hbs`{{print-test-attributes data-test-should-not-be}}`);
-
-      assert.dom('.data-test-positional-params').hasText(hasEmberVersion(2, 10) || !hasEmberVersion(2, 3) ? '' : '0', 'there should be no params');
-    });
-
-    (hasReliablePositionalParams ? test : skip)('it strips data-test-* attributes from components with positional params data-test-* as first param', async function(assert) {
-      await render(hbs`{{print-test-attributes data-test-should-not-be "param1"}}`);
-
-      assert.dom('.data-test-positional-params').hasText('1', 'there should be only one param');
-    });
-
-    (hasReliablePositionalParams ? test : skip)('it strips data-test-* attributes from components with multiple positional params', async function(assert) {
-      await render(hbs`{{print-test-attributes "param1" data-test-should-not-be}}`);
-
-      assert.dom('.data-test-positional-params').hasText('1', 'there should be only one param');
-    });
-
-    (hasReliablePositionalParams ? test : skip)('it strips data-test-* attributes from components with block and multiple positional params', async function(assert) {
-      await render(hbs`{{#print-test-attributes "param1" data-test-should-not-be}}{{/print-test-attributes}}`);
-
-      assert.dom('.data-test-positional-params').hasText('1', 'there should be only one param');
-    });
-
     test('it strips data-test-* attributes from components', async function(assert) {
       await render(hbs`{{print-test-attributes data-test-first="foobar"}}`);