zeus 0.15.2 → 0.15.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zeus (0.15.2)
+    zeus (0.15.3)
       method_source (>= 0.6.7)
 
 GEM

data/lib/zeus/rails.rb

@@ -191,7 +191,11 @@ module Zeus
       if ENV['RAILS_TEST_HELPER']
         require ENV['RAILS_TEST_HELPER']
       else
-        if File.exists?(ROOT_PATH + "/spec/spec_helper.rb")
+        if File.exists?(ROOT_PATH + "/spec/rails_helper.rb")
+          # RSpec >= 3.0+
+          require 'rails_helper'
+        elsif File.exists?(ROOT_PATH + "/spec/spec_helper.rb")
+          # RSpec < 3.0
           require 'spec_helper'
         elsif File.exists?(ROOT_PATH + "/test/minitest_helper.rb")
           require 'minitest_helper'

data/lib/zeus/version.rb

@@ -1,3 +1,3 @@
 module Zeus
-  VERSION = "0.15.2"
+  VERSION = "0.15.3"
 end

data/spec/rails_spec.rb

@@ -17,7 +17,16 @@ module Zeus
         ENV.clear
       end
 
+      it "requires rails_helper when using rspec 3.0+" do
+        mock_file_existence(ROOT_PATH + "/spec/rails_helper.rb", true)
+
+        rails.should_receive(:require).with("rails_helper")
+
+        rails.test_helper
+      end
+
       it "when spec_helper exists spec_helper is required" do
+        mock_file_existence(ROOT_PATH + "/spec/rails_helper.rb", false)
         mock_file_existence(ROOT_PATH + "/spec/spec_helper.rb", true)
 
         rails.should_receive(:require).with("spec_helper")
@@ -26,6 +35,7 @@ module Zeus
       end
 
       it "when minitest_helper exists minitest_helper is required" do
+        mock_file_existence(ROOT_PATH + "/spec/rails_helper.rb", false)
         mock_file_existence(ROOT_PATH + "/spec/spec_helper.rb", false)
         mock_file_existence(ROOT_PATH + "/test/minitest_helper.rb", true)
 
@@ -34,7 +44,8 @@ module Zeus
         rails.test_helper
       end
 
-      it "when there is no spec_helper or minitest_helper, test_helper is required" do
+      it "when there is no rspec helpers or minitest_helper, test_helper is required" do
+        mock_file_existence(ROOT_PATH + "/spec/rails_helper.rb", false)
         mock_file_existence(ROOT_PATH + "/spec/spec_helper.rb", false)
         mock_file_existence(ROOT_PATH + "/test/minitest_helper.rb", false)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zeus
 version: !ruby/object:Gem::Version
-  version: 0.15.2
+  version: 0.15.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-26 00:00:00.000000000 Z
+date: 2014-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -134,7 +134,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1370880474585093317
+      hash: 3094523066757945393
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -143,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1370880474585093317
+      hash: 3094523066757945393
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23