Merge pull request #1 from doits/add-es6-suffix

WIP: add es6 suffix to lint

11 files changed, 14 insertions, 4 deletions

diff --git a/lib/pronto/eslint.rb b/lib/pronto/eslint.rb
index b6ccff1..0de31b2 100644
--- a/lib/pronto/eslint.rb
+++ b/lib/pronto/eslint.rb
@@ -30,7 +30,7 @@ module Pronto
     end
 
     def js_file?(path)
-      File.extname(path) == '.js'
+      %w(.js .es6).include? File.extname(path)
     end
   end
 end
diff --git a/spec/fixtures/test.git/git/index b/spec/fixtures/test.git/git/index
index 786f76d..0b50aa9 100644
--- a/spec/fixtures/test.git/git/index
+++ b/spec/fixtures/test.git/git/index
diff --git a/spec/fixtures/test.git/git/logs/HEAD b/spec/fixtures/test.git/git/logs/HEAD
index 7e44d13..a4f13f8 100644
--- a/spec/fixtures/test.git/git/logs/HEAD
+++ b/spec/fixtures/test.git/git/logs/HEAD
@@ -11,3 +11,4 @@ e438134aac40ce86789d552f1bdada6582a987f6 85e04b1eb1a721d42db51d49e49dfeb8255a574
 85e04b1eb1a721d42db51d49e49dfeb8255a5741 931004157205727e6a47586feaed0473c6ddbd66 Mindaugas Mozūras <mindaugas.mozuras@gmail.com> 1456674164 +0200     commit (amend): Initial commit
 931004157205727e6a47586feaed0473c6ddbd66 931004157205727e6a47586feaed0473c6ddbd66 Mindaugas Mozūras <mindaugas.mozuras@gmail.com> 1456674177 +0200     checkout: moving from master to curly
 931004157205727e6a47586feaed0473c6ddbd66 3a6237c5feacca9a37c36bec5110a1eeb9da703b Mindaugas Mozūras <mindaugas.mozuras@gmail.com> 1456674189 +0200     commit: Add a line of code that does not have the correct curlies (eslint)
+3a6237c5feacca9a37c36bec5110a1eeb9da703b 37018e429ad00f0ec961bd218e3dfa6a6e8cc05b Markus Doits <markus.doits@stellenticket.de> 1460316876 +0200 commit: add es6 file
diff --git a/spec/fixtures/test.git/git/logs/refs/heads/curly b/spec/fixtures/test.git/git/logs/refs/heads/curly
index dfb7828..11582e5 100644
--- a/spec/fixtures/test.git/git/logs/refs/heads/curly
+++ b/spec/fixtures/test.git/git/logs/refs/heads/curly
@@ -1,2 +1,3 @@
 0000000000000000000000000000000000000000 931004157205727e6a47586feaed0473c6ddbd66 Mindaugas Mozūras <mindaugas.mozuras@gmail.com> 1456674177 +0200     branch: Created from HEAD
 931004157205727e6a47586feaed0473c6ddbd66 3a6237c5feacca9a37c36bec5110a1eeb9da703b Mindaugas Mozūras <mindaugas.mozuras@gmail.com> 1456674189 +0200     commit: Add a line of code that does not have the correct curlies (eslint)
+3a6237c5feacca9a37c36bec5110a1eeb9da703b 37018e429ad00f0ec961bd218e3dfa6a6e8cc05b Markus Doits <markus.doits@stellenticket.de> 1460316876 +0200 commit: add es6 file
diff --git a/spec/fixtures/test.git/git/objects/01/d6dc2234bda69a289104ffdf9667363a2414bd b/spec/fixtures/test.git/git/objects/01/d6dc2234bda69a289104ffdf9667363a2414bd
new file mode 100644
index 0000000..b4fe9ea
--- /dev/null
+++ b/spec/fixtures/test.git/git/objects/01/d6dc2234bda69a289104ffdf9667363a2414bd
@@ -0,0 +1,2 @@
+x
��A
+�0E]��d�ؘ���b2�`���L��[����>���i��v��p���v�\�i�=�>�CJ���Ǯ�$4O���)8�$f�i�>$��Z$�.�L��Т�i�+����e���8�h��tn*ð:+�EwYN`�
�
]�E�h��V�_�����A�U������61CW
\ No newline at end of file
diff --git a/spec/fixtures/test.git/git/objects/37/018e429ad00f0ec961bd218e3dfa6a6e8cc05b b/spec/fixtures/test.git/git/objects/37/018e429ad00f0ec961bd218e3dfa6a6e8cc05b
new file mode 100644
index 0000000..1d5c313
--- /dev/null
+++ b/spec/fixtures/test.git/git/objects/37/018e429ad00f0ec961bd218e3dfa6a6e8cc05b
@@ -0,0 +1 @@
+x
��A� �aלb�&
 1ƅ[1���ZS�������o�<^�ylлtj���=,Z�lb����b��ť�i�}RZ����6���)Ѿ-fao�&#�S��[���\Vx���*ܗ�U��Gu�W��d�vs䗴���Cm
ƀpֽ֊��M�u�R�q�՗P�
\ No newline at end of file
diff --git a/spec/fixtures/test.git/git/objects/77/b5c76d003b18b78c41b86e36884ce49f40c259 b/spec/fixtures/test.git/git/objects/77/b5c76d003b18b78c41b86e36884ce49f40c259
new file mode 100644
index 0000000..db2600a
--- /dev/null
+++ b/spec/fixtures/test.git/git/objects/77/b5c76d003b18b78c41b86e36884ce49f40c259
diff --git a/spec/fixtures/test.git/git/objects/cf/e8bc15022f8b4d3cea89bc20abb13f985feeb0 b/spec/fixtures/test.git/git/objects/cf/e8bc15022f8b4d3cea89bc20abb13f985feeb0
new file mode 100644
index 0000000..b0bc9b3
--- /dev/null
+++ b/spec/fixtures/test.git/git/objects/cf/e8bc15022f8b4d3cea89bc20abb13f985feeb0
diff --git a/spec/fixtures/test.git/git/refs/heads/curly b/spec/fixtures/test.git/git/refs/heads/curly
index ce18055..21919cd 100644
--- a/spec/fixtures/test.git/git/refs/heads/curly
+++ b/spec/fixtures/test.git/git/refs/heads/curly
@@ -1 +1 @@
-3a6237c5feacca9a37c36bec5110a1eeb9da703b
+37018e429ad00f0ec961bd218e3dfa6a6e8cc05b
diff --git a/spec/fixtures/test.git/world.es6 b/spec/fixtures/test.git/world.es6
new file mode 100644
index 0000000..2d1b996
--- /dev/null
+++ b/spec/fixtures/test.git/world.es6
@@ -0,0 +1,5 @@
+function HelloWorld(name)
+{
+    if (foo) foo++;
+    alert(name);
+}
diff --git a/spec/pronto/eslint_spec.rb b/spec/pronto/eslint_spec.rb
index 29d46e4..7af0aa2 100644
--- a/spec/pronto/eslint_spec.rb
+++ b/spec/pronto/eslint_spec.rb
@@ -17,12 +17,12 @@ module Pronto
         it { should == [] }
       end
 
-      context 'patches with a four warnings' do
+      context 'patches with a four and a five warnings' do
         include_context 'test repo'
 
         let(:patches) { repo.diff('master') }
 
-        its(:count) { should == 4 }
+        its(:count) { should == 9 }
         its(:'first.msg') { should == "Expected { after 'if' condition." }
       end
     end