rspec2

samvera · Dec 12, 2011 · 660aba7 · 660aba7
1 parent 0583c8c
commit 660aba7
Show file tree

Hide file tree

Showing 47 changed files with 74 additions and 84 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -38,6 +38,7 @@ GEM
       ffi (~> 1.0.6)
     columnize (0.3.4)
     daemons (1.1.4)
+    diff-lcs (1.1.3)
     equivalent-xml (0.2.8)
       nokogiri (>= 1.4.3)
     facets (2.9.2)
@@ -81,7 +82,14 @@ GEM
       mime-types (>= 1.16)
     rsolr (1.0.2)
       builder (>= 2.1.2)
-    rspec (1.3.2)
+    rspec (2.7.0)
+      rspec-core (~> 2.7.0)
+      rspec-expectations (~> 2.7.0)
+      rspec-mocks (~> 2.7.0)
+    rspec-core (2.7.1)
+    rspec-expectations (2.7.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.7.0)
     ruby-debug (0.10.4)
       columnize (>= 0.1)
       ruby-debug-base (~> 0.10.4.0)
@@ -133,7 +141,7 @@ DEPENDENCIES
   mocha (>= 0.9.8)
   rake
   rcov
-  rspec (< 2.0.0)
+  rspec (~> 2.0)
   ruby-debug
   solrizer-fedora (>= 1.1.3)
   yard
diff --git a/Rakefile b/Rakefile
@@ -3,14 +3,15 @@ require 'rubygems'
 require 'bundler'
 require "bundler/setup"
 
-
-$: << 'lib'
-
 Bundler::GemHelper.install_tasks
 
 # load rake tasks defined in lib/tasks
 Dir["lib/tasks/**/*.rake"].each { |ext| load ext } if defined?(Rake)
 
 CLEAN.include %w[**/.DS_Store tmp *.log *.orig *.tmp **/*~]
 
+task :spec => ['active_fedora:rspec']
+task :rcov => ['active_fedora:rcov']
+
+
 task :default => [:spec]
diff --git a/active-fedora.gemspec b/active-fedora.gemspec
@@ -36,7 +36,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency("rcov")
   s.add_development_dependency("solrizer-fedora", ">=1.1.3") # used by the fixtures rake tasks
   s.add_development_dependency("jettywrapper", ">=1.1.0")
-  s.add_development_dependency("rspec", "<2.0.0")
+  s.add_development_dependency("rspec", "~> 2.0")
   s.add_development_dependency("mocha", ">= 0.9.8")
   s.add_development_dependency("ruby-debug")  
 

diff --git a/config/jetty.yml b/config/jetty.yml
@@ -1,3 +1,5 @@
-jetty_port: 8983
-java_opts:
-  - "-Xmx256m -XX:MaxPermSize=128m"
+default:
+  jetty_port: 8983
+  java_opts:
+    - "-Xmx256m" 
+    - "-XX:MaxPermSize=128m"
diff --git a/lib/tasks/active_fedora_dev.rake b/lib/tasks/active_fedora_dev.rake
@@ -1,32 +1,9 @@
-begin
-  require 'spec'
-rescue LoadError
-  require 'rubygems'
-  require 'spec'
-end
-begin
-  require 'spec/rake/spectask'
-rescue LoadError
-  puts <<-EOS
-To use rspec for testing you must install rspec gem:
-    gem install rspec
-EOS
-  exit(0)
-end
-
 APP_ROOT = File.expand_path("#{File.dirname(__FILE__)}/../../")
-require 'jettywrapper'
 
-$: << 'lib'
-
-desc "Run active-fedora rspec tests"
-task :spec do
-  Rake::Task["active_fedora:rspec"].invoke
-end
+require 'jettywrapper'
 
 desc "Hudson build"
 task :hudson do
-
   ENV['environment'] = "test"
   Rake::Task["active_fedora:doc"].invoke
   Rake::Task["active_fedora:configure_jetty"].invoke
@@ -46,7 +23,7 @@ namespace :active_fedora do
   begin
     require 'yard'
     require 'yard/rake/yardoc_task'
-    project_root = File.expand_path("#{File.dirname(__FILE__)}/../../")
+    project_root = APP_ROOT
     doc_destination = File.join(project_root, 'doc')
 
     YARD::Rake::YardocTask.new(:doc) do |yt|
@@ -61,12 +38,16 @@ namespace :active_fedora do
     end
   end
 
+require 'rspec/core/rake_task'
+  RSpec::Core::RakeTask.new(:rspec) do |spec|
+    spec.pattern = FileList['spec/**/*_spec.rb']
+    spec.pattern += FileList['spec/*_spec.rb']
+  end
 
-  Spec::Rake::SpecTask.new(:rspec) do |t|
-    t.spec_files = FileList['spec/**/*_spec.rb']
-    t.rcov = true
-    t.rcov_opts << ['--exclude', 'gems']
-    t.rcov_opts << ['--exclude', 'spec']
+  RSpec::Core::RakeTask.new(:rcov) do |spec|
+    spec.pattern = FileList['spec/**/*_spec.rb']
+    spec.pattern += FileList['spec/*_spec.rb']
+    spec.rcov = true
   end
 
   task :clean_jetty do

diff --git a/spec/integration/base_file_management_spec.rb b/spec/integration/base_file_management_spec.rb
@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__), "../spec_helper" )
+require 'spec_helper'
 
 describe ActiveFedora::Base do
 

diff --git a/spec/integration/base_find_by_fields_spec.rb b/spec/integration/base_find_by_fields_spec.rb
@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__), "..", "spec_helper" )
+require 'spec_helper'
 
 class MockAFBaseQuerySolr < ActiveFedora::Base
   has_metadata :name => "properties", :type => ActiveFedora::MetadataDatastream do |m|

diff --git a/spec/integration/base_loader_spec.rb b/spec/integration/base_loader_spec.rb
@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__), "..", "spec_helper" )
+require 'spec_helper'
 require 'active_fedora'
 require 'active_fedora/base'
 require 'active_fedora/metadata_datastream'

diff --git a/spec/integration/base_spec.rb b/spec/integration/base_spec.rb
@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__), "../spec_helper" )
+require 'spec_helper'
 
 class MockAFBaseRelationship < ActiveFedora::Base
   has_relationship "testing", :has_part, :type=>MockAFBaseRelationship

diff --git a/spec/integration/bug_spec.rb b/spec/integration/bug_spec.rb
@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__), "..", "spec_helper" )
+require 'spec_helper'
 
 require 'active_fedora'
 require 'active_fedora/model'

diff --git a/spec/integration/datastream_spec.rb b/spec/integration/datastream_spec.rb
@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__), "../spec_helper" )
+require 'spec_helper'
 
 require 'active_fedora'
 require "rexml/document"

diff --git a/spec/integration/full_featured_model_spec.rb b/spec/integration/full_featured_model_spec.rb
@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__), "../spec_helper" )
+require 'spec_helper'
 require 'rexml/document'
 require "active_fedora/samples"
 

diff --git a/spec/integration/metadata_datastream_helper_spec.rb b/spec/integration/metadata_datastream_helper_spec.rb
@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__), "../spec_helper" )
+require 'spec_helper'
 
 require 'active-fedora'
 require "rexml/document"

diff --git a/spec/integration/model_spec.rb b/spec/integration/model_spec.rb
@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__), "..", "spec_helper" )
+require 'spec_helper'
 
 require 'active_fedora'
 require 'active_fedora/model'

diff --git a/spec/integration/mods_article_integration_spec.rb b/spec/integration/mods_article_integration_spec.rb
@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__), "../spec_helper" )
+require 'spec_helper'
 require "active_fedora/samples"
 
 describe ActiveFedora::Base do

diff --git a/spec/integration/nokogiri_datastream_spec.rb b/spec/integration/nokogiri_datastream_spec.rb
@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__), "../spec_helper" )
+require 'spec_helper'
 require "active_fedora/samples"
 require "solrizer"
 

diff --git a/spec/integration/rels_ext_datastream_spec.rb b/spec/integration/rels_ext_datastream_spec.rb
@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__), "../spec_helper" )
+require 'spec_helper'
 
 require 'active_fedora'
 require "rexml/document"

diff --git a/spec/integration/semantic_node_spec.rb b/spec/integration/semantic_node_spec.rb
@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__), "../spec_helper" )
+require 'spec_helper'
 
 require 'active_fedora'
 

diff --git a/spec/integration/solr_service_spec.rb b/spec/integration/solr_service_spec.rb
@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__), "../spec_helper" )
+require 'spec_helper'
 
 require 'active_fedora'
 

diff --git a/spec/rails3_test_app/spec/unit/rails_3_init.rb b/spec/rails3_test_app/spec/unit/rails_3_init.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '../spec_helper')
+require 'spec_helper'
 
 describe "initializing active-fedora in a rails 3 app" do
   it "should include ActiveFedora::Railtie" do

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -1,22 +1,20 @@
 ENV["environment"] ||= 'test'
 require "bundler/setup"
 require 'active-fedora'
-require 'spec'
+require 'rspec'
 require 'equivalent-xml/rspec_matchers'
 
 require 'support/mock_fedora'
 
 
 logger.level = Logger::WARN if logger.respond_to? :level ###MediaShelf StubLogger doesn't have a level= method
-
-$:.unshift(File.dirname(__FILE__) + '/../lib')
 $VERBOSE=nil
 
 # This loads the Fedora and Solr config info from /config/fedora.yml
 # You can load it from a different location by passing a file path as an argument.
 ActiveFedora.init(:fedora_config_path=>File.join(File.dirname(__FILE__), "..", "config", "fedora.yml"))
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   config.mock_with :mocha
 end
 

diff --git a/spec/unit/active_fedora_spec.rb b/spec/unit/active_fedora_spec.rb
@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__), "../spec_helper" )
+require 'spec_helper'
 
 # For testing Module-level methods like ActiveFedora.init
 

diff --git a/spec/unit/base_active_model_spec.rb b/spec/unit/base_active_model_spec.rb
@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__), "../spec_helper" )
+require 'spec_helper'
 
 describe ActiveFedora::Base do
 

diff --git a/spec/unit/base_cma_spec.rb b/spec/unit/base_cma_spec.rb
@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__), "../spec_helper" )
+require 'spec_helper'
 
 describe ActiveFedora::Base do
 

diff --git a/spec/unit/base_datastream_management_spec.rb b/spec/unit/base_datastream_management_spec.rb
@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__), "../spec_helper" )
+require 'spec_helper'
 
 describe ActiveFedora::Base do
 

diff --git a/spec/unit/base_delegate_spec.rb b/spec/unit/base_delegate_spec.rb
@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__), "../spec_helper" )
+require 'spec_helper'
 
 describe ActiveFedora::Base do
 

diff --git a/spec/unit/base_extra_spec.rb b/spec/unit/base_extra_spec.rb
@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__), "../spec_helper" )
+require 'spec_helper'
 require 'active_fedora'
 require 'active_fedora/base'
 require 'active_fedora/metadata_datastream'

diff --git a/spec/unit/base_file_management_spec.rb b/spec/unit/base_file_management_spec.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 # Some tentative extensions to ActiveFedora::Base
 

diff --git a/spec/unit/base_named_datastream_spec.rb b/spec/unit/base_named_datastream_spec.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 require "active_fedora"
 
 # Some tentative extensions to ActiveFedora::Base

diff --git a/spec/unit/base_spec.rb b/spec/unit/base_spec.rb
@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__), "../spec_helper" )
+require 'spec_helper'
 
 require 'active_fedora'
 require 'active_fedora/base'

diff --git a/spec/unit/content_model_spec.rb b/spec/unit/content_model_spec.rb
@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__), "../spec_helper" )
+require 'spec_helper'
 
 require 'active_fedora'
 require 'mocha'

diff --git a/spec/unit/datastream_concurrency_spec.rb b/spec/unit/datastream_concurrency_spec.rb
@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__), "../spec_helper" )
+require 'spec_helper'
 
 require 'active_fedora'
 require "rexml/document"

diff --git a/spec/unit/datastream_spec.rb b/spec/unit/datastream_spec.rb
@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__), "../spec_helper" )
+require 'spec_helper'
 
 require 'active_fedora'
 require "nokogiri"

diff --git a/spec/unit/inheritance_spec.rb b/spec/unit/inheritance_spec.rb
@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__), "../spec_helper" )
+require 'spec_helper'
 
 require 'active_fedora'
 require 'active_fedora/base'

diff --git a/spec/unit/metadata_datastream_spec.rb b/spec/unit/metadata_datastream_spec.rb
@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__), "../spec_helper" )
+require 'spec_helper'
 
 require 'active_fedora'
 require 'active_fedora/metadata_datastream'

diff --git a/spec/unit/model_spec.rb b/spec/unit/model_spec.rb
@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__), "../spec_helper" )
+require 'spec_helper'
 
 require 'active_fedora'
 require 'active_fedora/model'

diff --git a/spec/unit/nokogiri_datastream_spec.rb b/spec/unit/nokogiri_datastream_spec.rb
@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__), "../spec_helper" )
+require 'spec_helper'
 require "active_fedora/samples"
 describe ActiveFedora::NokogiriDatastream do
 

diff --git a/spec/unit/property_spec.rb b/spec/unit/property_spec.rb
@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__), "../spec_helper" )
+require 'spec_helper'
 
 require 'active_fedora'
 require 'active_fedora/model'

diff --git a/spec/unit/qualified_dublin_core_datastream_spec.rb b/spec/unit/qualified_dublin_core_datastream_spec.rb
@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__), "../spec_helper" )
+require 'spec_helper'
 
 require 'active_fedora'
 require 'xmlsimple'

diff --git a/spec/unit/rdf_xml_writer.rb b/spec/unit/rdf_xml_writer.rb
@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__), "../spec_helper" )
+require 'spec_helper'
 require File.join( File.dirname(__FILE__), "../../lib/active_fedora/rdf_xml_writer" )
 
 describe ActiveFedora::RDFXMLWriter do

diff --git a/spec/unit/relationship_spec.rb b/spec/unit/relationship_spec.rb
@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__), "../spec_helper" )
+require 'spec_helper'
 
 require 'active_fedora'
 require "rexml/document"

diff --git a/spec/unit/relationships_helper_spec.rb b/spec/unit/relationships_helper_spec.rb
@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__), "../spec_helper" )
+require 'spec_helper'
 
 require 'active_fedora'
 require 'xmlsimple'

diff --git a/spec/unit/rels_ext_datastream_spec.rb b/spec/unit/rels_ext_datastream_spec.rb
@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__), "../spec_helper" )
+require 'spec_helper'
 
 describe ActiveFedora::RelsExtDatastream do
   describe "short_predicate" do

diff --git a/spec/unit/rubydora_connection_spec.rb b/spec/unit/rubydora_connection_spec.rb
@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__),  "../spec_helper" )
+require 'spec_helper'
 require 'active_fedora/rubydora_connection'
 
 describe ActiveFedora::RubydoraConnection do

diff --git a/spec/unit/semantic_node_spec.rb b/spec/unit/semantic_node_spec.rb
@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__), "../spec_helper" )
+require 'spec_helper'
 
 require 'xmlsimple'
 

diff --git a/spec/unit/solr_config_options_spec.rb b/spec/unit/solr_config_options_spec.rb
@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__), "../spec_helper" )
+require 'spec_helper'
 
 
 #include ActiveFedora