Fix travis configuration for spec

5 files changed, 18 insertions, 28 deletions

diff --git a/.travis.yml b/.travis.yml
index 12a76aa55..e7ad09401 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 language: ruby
 rvm:
   - 1.9.3
-  - 2.1.3
+  - 2.1.5
   - jruby-1.7.19
 jdk:
   - oraclejdk7
@@ -10,7 +10,7 @@ matrix:
   exclude:
     - rvm:  1.9.3
       jdk: openjdk7
-    - rvm:  2.1.3
+    - rvm:  2.1.5
       jdk: openjdk7        
 notifications:
   email:        
diff --git a/Gemfile.lock b/Gemfile.lock
index 76a675918..d10dfacb2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -206,7 +206,7 @@ GEM
       jquery-ui-rails (= 4.0.3)
       railties (>= 3.1.0)
     jruby-jars (1.7.19)
-    jruby-openssl (0.9.6-java)
+    jruby-openssl (0.9.7-java)
     jruby-rack (1.1.18)
     jruby-rack-worker (0.10.0)
       jruby-rack (>= 1.1.10)
@@ -299,7 +299,7 @@ GEM
       rails-assets-bootstrap (>= 3.0)
       rails-assets-jquery (>= 1.8.3)
       rails-assets-moment (>= 2.8.0)
-    rails-assets-jquery (2.1.3)
+    rails-assets-jquery (2.1.4)
     rails-assets-jquery-tokeninput (1.7.0)
       rails-assets-jquery (>= 1.5)
     rails-assets-mocha (1.17.1)
diff --git a/config/initializers/jruby.rb b/config/initializers/jruby.rb
new file mode 100644
index 000000000..4956bc424
--- /dev/null
+++ b/config/initializers/jruby.rb
@@ -0,0 +1,14 @@
+if RUBY_PLATFORM == 'java' # Allows the application to work with other Rubies if not JRuby
+  require 'java'
+  java_import 'java.lang.ClassNotFoundException'
+
+  begin
+    security_class = java.lang.Class.for_name('javax.crypto.JceSecurity')
+    restricted_field = security_class.get_declared_field('isRestricted')
+    restricted_field.accessible = true
+    restricted_field.set nil, false
+  rescue ClassNotFoundException => e
+    # Handle Mac Java, etc not having this configuration setting
+    $stderr.print "Java told me: #{e}n"
+  end
+end
diff --git a/spec/models/csv_export_spec.rb b/spec/models/csv_export_spec.rb
deleted file mode 100644
index 359474c2a..000000000
--- a/spec/models/csv_export_spec.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-# require 'spec_helper'
-
-# describe CsvExport, :type => :model do
-
-#   describe '#export_options' do
-#     subject { super().export_options }
-#     it { is_expected.to include(:format => :csv) }
-#   end
-  
-# end
diff --git a/spec/models/csv_import_spec.rb b/spec/models/csv_import_spec.rb
deleted file mode 100644
index e78f6ffbf..000000000
--- a/spec/models/csv_import_spec.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-require 'spec_helper'
-
-describe CsvImport, :type => :model do
-
- describe "#object_id_prefix" do
-
-   # it "should be included in import_options" do
-   #   subject.object_id_prefix = "dummy"
-   #   expect(subject.parameter_set["object_id_prefix"]).to eq("dummy")
-   # end
-
- end
-
-end