Rebase and merge conflicts

Author: eelyafi

lib/rules/jsx-indent.js

@@ -39,6 +39,8 @@ module.exports = {
       category: 'Stylistic Issues',
       recommended: false
     },
+    // fixer will fix whitespace and tabs indentation.
+    // It won't replace tabs with whitespaces and vice-versa.
     fixable: 'whitespace',
     schema: [{
       oneOf: [{
@@ -69,7 +71,7 @@ module.exports = {
       }
     }
 
-    var indentChar = indentType === 'space' ? ' ' : '\u0009';
+    var indentChar = indentType === 'space' ? ' ' : '\t';
 
     /**
      * Responsible for fixing the indentation issue fix

tests/lib/rules/jsx-indent.js

@@ -236,6 +236,57 @@ ruleTester.run('jsx-indent', rule, {
     errors: [
       {message: 'Expected indentation of 3 tab characters but found 2.'}
     ]
-  }]
+  }, {
+    code: [
+      '<App>\n',
+      '<Foo />\n',
+      '</App>'
+    ].join('\n'),
+    output: [
+      '<App>\n',
+      '\t<Foo />\n',
+      '</App>'
+    ].join('\n'),
+    parserOptions: parserOptions,
+    options: ['tab'],
+    errors: [
+      {message: 'Expected indentation of 1 tab character but found 0.'}
+    ]
+  }
+  // Tests for future work. See the comment on line 42-43 in the rule near to fixable: 'whitespace' meta property,
+  // Right now fixer function doesn't support replacing tabs with whitespaces and vice-versa.
+  /* , {
+    code: [
+      '<App>\n',
+      ' <Foo />\n',
+      '</App>'
+    ].join('\n'),
+    output: [
+      '<App>\n',
+      '\t<Foo />\n',
+      '</App>'
+    ].join('\n'),
+    parserOptions: parserOptions,
+    options: ['tab'],
+    errors: [
+      {message: 'Expected indentation of 1 tab character but found 0.'}
+    ]
+  }, {
+    code: [
+      '<App>\n',
+      '\t<Foo />\n',
+      '</App>'
+    ].join('\n'),
+    output: [
+      '<App>\n',
+      '  <Foo />\n',
+      '</App>'
+    ].join('\n'),
+    parserOptions: parserOptions,
+    options: [2],
+    errors: [
+      {message: 'Expected indentation of 2 space characters but found 0.'}
+    ]
+  }*/]
 });