Merge pull request #22 from projecthydra/test_edge_hydra

Test against edge hydra-head

.travis.yml

@@ -1,11 +1,12 @@
 language: ruby
 rvm:
-  - 1.9.3
   - 2.0.0
+  - 1.9.3
 
 gemfile:
+  - gemfiles/edge-hydra-head.gemfile
   - gemfiles/gemfile.rails3
   - gemfiles/gemfile.rails4
 
 notifications:
-  irc: "irc.freenode.org#projecthydra"
+  irc: "irc.freenode.org#projecthydra"

Rakefile

@@ -44,14 +44,11 @@ task :setup do
   end
 end
 
-desc "Run the spec tests"
-task :spec => :setup do
-  here = File.expand_path("../", __FILE__)
-  Dir.chdir(dummy) do
-    Bundler.with_clean_env do
-      sh "bundle exec rspec --color -I#{here}/spec #{here}/spec"
-    end
-  end
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec => :setup) do |t|
+  t.pattern =  'spec/**/*_spec.rb'
 end
 
+
 task :default => :spec

gemfiles/edge-hydra-head.gemfile

@@ -0,0 +1,18 @@
+source "https://rubygems.org"
+
+gemspec :path=>"../"
+
+gem 'rails', '~> 4.0.0'
+
+gem 'active-fedora', github: 'projecthydra/active_fedora'
+gem 'hydra-head', github: 'projecthydra/hydra-head'
+
+group :test do
+  gem "turbolinks"
+  gem "jquery-rails"
+  gem "bootstrap-sass"
+  gem 'devise'
+  gem 'devise-guests'
+  gem 'blacklight'
+end
+

gemfiles/gemfile.rails3

@@ -4,6 +4,8 @@ gemspec :path=>"../"
 
 gem 'rails', '~> 3.2'
 
+gem 'hydra'
+
 group :test do
   gem 'devise'
   gem 'devise-guests'

gemfiles/gemfile.rails4

@@ -4,7 +4,12 @@ gemspec :path=>"../"
 
 gem 'rails', '~> 4.0.0'
 
+gem 'hydra'
+
 group :test do
+  gem "turbolinks"
+  gem "jquery-rails"
+  gem "bootstrap-sass"
   gem 'devise'
   gem 'devise-guests'
   gem 'blacklight'

hydra-editor.gemspec

@@ -21,7 +21,8 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "sqlite3"
   s.add_development_dependency "rspec-rails"
+  s.add_development_dependency "factory_girl_rails"
   s.add_development_dependency "capybara"
   s.add_development_dependency "devise"
-  s.add_development_dependency "hydra"
+  s.add_development_dependency "hydra-head"
 end

spec/spec_helper.rb

@@ -4,9 +4,6 @@
 require 'rspec/autorun'
 require 'factory_girl_rails'
 
-FactoryGirl.definition_file_paths = ["#{File.dirname(__FILE__)}/factories"]
-FactoryGirl.find_definitions
-
 Rails.backtrace_cleaner.remove_silencers!
 # Load support files
 

spec/support/lib/generators/test_app_generator.rb

@@ -4,12 +4,13 @@ class TestAppGenerator < Rails::Generators::Base
 
   def configure
 
-    gem 'hydra', '6.1.0'
+    gem 'hydra-head'
     gem 'hydra-editor', path: '../../'
     gem "factory_girl_rails"
     gem 'capybara'
 
-    generate "hydra:install"
+    generate "blacklight --devise"
+    generate "hydra:head -f"
 
     rake "db:migrate"
     rake "db:test:prepare"
@@ -19,6 +20,7 @@ def configure
     insert_into_file "config/routes.rb", :after => '.draw do' do
       "\n  mount HydraEditor::Engine => \"/\"\n"
     end
+    remove_file "spec/factories/users.rb" # generated by devise
     remove_file "spec/models/user_spec.rb" # generated by devise
 
   end