fix snippet syntax

closes #711 resolves #710
cucumber · Dec 30, 2016 · e3ff263 · e3ff263
1 parent fd78323
commit e3ff263
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 15 deletions.
diff --git a/features/custom_formatter.feature b/features/custom_formatter.feature
@@ -86,7 +86,7 @@ Feature: custom formatter
          Message:
            Undefined. Implement with the following snippet:
 
-             this.Given('an undefined step', function (callback) {
+             Given('an undefined step', function (callback) {
                // Write code here that turns the phrase above into concrete actions
                callback(null, 'pending');
              });

diff --git a/features/snippets_formatter.feature b/features/snippets_formatter.feature
@@ -18,17 +18,17 @@ Feature: snippets formatter
     Then it fails
     And it outputs the text:
       """
-      this.Given('undefined step A', function (callback) {
+      Given('undefined step A', function (callback) {
         // Write code here that turns the phrase above into concrete actions
         callback(null, 'pending');
       });
 
-      this.When('undefined step B', function (callback) {
+      When('undefined step B', function (callback) {
         // Write code here that turns the phrase above into concrete actions
         callback(null, 'pending');
       });
 
-      this.Then('undefined step C', function (callback) {
+      Then('undefined step C', function (callback) {
         // Write code here that turns the phrase above into concrete actions
         callback(null, 'pending');
       });

diff --git a/features/step_definition_snippets_i18n.feature b/features/step_definition_snippets_i18n.feature
@@ -19,21 +19,21 @@ Feature: step definition snippets i18n
     Then it fails
     And the output contains the text:
       """
-      this.Given('undefined step A', function (callback) {
+      Given('undefined step A', function (callback) {
         // Write code here that turns the phrase above into concrete actions
         callback(null, 'pending');
       });
       """
     And the output contains the text:
       """
-      this.When('undefined step B', function (callback) {
+      When('undefined step B', function (callback) {
         // Write code here that turns the phrase above into concrete actions
         callback(null, 'pending');
       });
       """
     And the output contains the text:
       """
-      this.Then('undefined step C', function (callback) {
+      Then('undefined step C', function (callback) {
         // Write code here that turns the phrase above into concrete actions
         callback(null, 'pending');
       });

diff --git a/features/step_definition_snippets_interfaces.feature b/features/step_definition_snippets_interfaces.feature
@@ -16,7 +16,7 @@ Feature: step definition snippets custom syntax
     Then it fails
     And the output contains the text:
       """
-      this.Given('an undefined step', <SNIPPET_FUNCTION_KEYWORD_AND_PARAMETERS> {
+      Given('an undefined step', <SNIPPET_FUNCTION_KEYWORD_AND_PARAMETERS> {
         // Write code here that turns the phrase above into concrete actions
         <SNIPPET_IMPLEMENTATION>;
       });

diff --git a/features/step_definitions/cli_steps.js b/features/step_definitions/cli_steps.js
@@ -93,7 +93,7 @@ defineSupportCode(function({When, Then}) {
       }
     }
     parameters.push('callback')
-    const expectedOutput = 'this.' + step + '(' + regExp + ', function (' + parameters.join(', ') + ') {\n'
+    const expectedOutput = step + '(' + regExp + ', function (' + parameters.join(', ') + ') {\n'
     const actualOutput = normalizeText(this.lastRun.output)
     expect(actualOutput).to.include(expectedOutput)
   })

diff --git a/src/formatter/step_definition_snippet_builder/javascript_snippet_syntax.js b/src/formatter/step_definition_snippet_builder/javascript_snippet_syntax.js
@@ -21,7 +21,7 @@ export default class JavaScriptSnippetSyntax {
     }
 
     const snippet =
-      'this.' + functionName + '(\'' + pattern.replace(/'/g, '\\\'') + '\', ' + functionKeyword + '(' + parameters.join(', ') + ') {' + '\n' +
+      functionName + '(\'' + pattern.replace(/'/g, '\\\'') + '\', ' + functionKeyword + '(' + parameters.join(', ') + ') {' + '\n' +
       '  // ' + comment + '\n' +
       '  ' + implementation + '\n' +
       '});'

diff --git a/src/formatter/step_definition_snippet_builder/javascript_snippet_syntax_spec.js b/src/formatter/step_definition_snippet_builder/javascript_snippet_syntax_spec.js
@@ -10,7 +10,7 @@ describe('JavascriptSnippetSyntax', function () {
       it('returns the proper snippet', function () {
         const actual = this.syntax.build('functionName', 'pattern', ['arg1', 'arg2', 'callback'], 'comment')
         const expected =
-          'this.functionName(\'pattern\', function (arg1, arg2, callback) {' + '\n' +
+          'functionName(\'pattern\', function (arg1, arg2, callback) {' + '\n' +
           '  // comment' + '\n' +
           '  callback(null, \'pending\');' + '\n' +
           '});'
@@ -26,7 +26,7 @@ describe('JavascriptSnippetSyntax', function () {
       it('returns the proper snippet', function () {
         const actual = this.syntax.build('functionName', 'pattern', ['arg1', 'arg2', 'callback'], 'comment')
         const expected =
-          'this.functionName(\'pattern\', function *(arg1, arg2) {' + '\n' +
+          'functionName(\'pattern\', function *(arg1, arg2) {' + '\n' +
           '  // comment' + '\n' +
           '  return \'pending\';' + '\n' +
           '});'
@@ -42,7 +42,7 @@ describe('JavascriptSnippetSyntax', function () {
       it('returns the proper snippet', function () {
         const actual = this.syntax.build('functionName', 'pattern', ['arg1', 'arg2', 'callback'], 'comment')
         const expected =
-          'this.functionName(\'pattern\', function (arg1, arg2) {' + '\n' +
+          'functionName(\'pattern\', function (arg1, arg2) {' + '\n' +
           '  // comment' + '\n' +
           '  return \'pending\';' + '\n' +
           '});'
@@ -58,7 +58,7 @@ describe('JavascriptSnippetSyntax', function () {
       it('returns the proper snippet', function () {
         const actual = this.syntax.build('functionName', 'pattern', ['arg1', 'arg2', 'callback'], 'comment')
         const expected =
-          'this.functionName(\'pattern\', function (arg1, arg2) {' + '\n' +
+          'functionName(\'pattern\', function (arg1, arg2) {' + '\n' +
           '  // comment' + '\n' +
           '  return \'pending\';' + '\n' +
           '});'
@@ -74,7 +74,7 @@ describe('JavascriptSnippetSyntax', function () {
       it('returns the proper snippet', function () {
         const actual = this.syntax.build('functionName', 'pattern\'', ['arg1', 'arg2', 'callback'], 'comment')
         const expected =
-          'this.functionName(\'pattern\\\'\', function (arg1, arg2) {' + '\n' +
+          'functionName(\'pattern\\\'\', function (arg1, arg2) {' + '\n' +
           '  // comment' + '\n' +
           '  return \'pending\';' + '\n' +
           '});'