Merge pull request activeadmin#254 from mattvague/master

Only try to run the JS Lint test if Java is installed (the test requires Java)

Author: gregbell

spec/integration/javascript_spec.rb

@@ -1,15 +1,20 @@
 require 'spec_helper'
 require 'jslint'
 
-describe "Javascript" do
-  
-  before do
-    @lint = JSLint::Lint.new(
-      :config_path => 'spec/support/jslint.yml'
-    )
-  end
-  
-  it "should not have any syntax errors" do
-    @lint.run
+%x[java]
+if $? == 0 # Only run the JS Lint test if Java is installed
+  describe "Javascript" do
+    before do
+      @lint = JSLint::Lint.new(
+        :paths => ['public/javascripts/**/*.js'],
+        :exclude_paths => ['public/javascripts/vendor/**/*.js'],
+        :config_path => 'spec/support/jslint.yml'
+      )
+    end
+
+    it "should not have any syntax errors" do
+      @lint.run
+    end
   end
 end
+