diff --git a/Gemfile b/Gemfile index 3666593..194e270 100644 --- a/Gemfile +++ b/Gemfile @@ -9,10 +9,6 @@ gemspec # your gemspec. These might include edge Rails or gems from your path or # Git. Remember to move these dependencies to your gemspec before releasing # your gem to rubygems.org. -gem 'enju_leaf', github: 'next-l/enju_leaf', branch: '1.2' -gem 'enju_biblio', github: 'next-l/enju_biblio', branch: '1.2' -gem 'enju_library', github: 'next-l/enju_library', branch: '1.2' -gem 'enju_manifestation_viewer', github: 'next-l/enju_manifestation_viewer', branch: '1.2' # To use debugger # gem 'debugger' diff --git a/enju_inventory.gemspec b/enju_inventory.gemspec index ea7c719..629ac47 100644 --- a/enju_inventory.gemspec +++ b/enju_inventory.gemspec @@ -16,15 +16,17 @@ Gem::Specification.new do |s| s.files = Dir["{app,config,db,lib}/**/*"] + ["MIT-LICENSE", "Rakefile", "README.rdoc"] s.test_files = Dir["spec/**/*"] - Dir["spec/dummy/log/*"] - Dir["spec/dummy/solr/{data,pids,default,development,test}/*"] - Dir["spec/dummy/tmp/*"] - #s.add_dependency "enju_library", "~> 0.1.0" + s.add_dependency "enju_library", "~> 0.2.0.beta.1" s.add_dependency "paperclip" + s.add_development_dependency "enju_leaf", "~> 1.2.0.beta.1" + s.add_development_dependency "enju_biblio", "~> 0.2.0.beta.1" + s.add_development_dependency "enju_manifestation_viewer", "~> 0.2.0.beta.1" s.add_development_dependency "sqlite3" s.add_development_dependency "mysql2" s.add_development_dependency "pg" s.add_development_dependency "rspec-rails", "~> 3.4" s.add_development_dependency "factory_girl_rails" - #s.add_development_dependency "enju_leaf", "~> 1.1.0" s.add_development_dependency "simplecov" s.add_development_dependency "annotate" s.add_development_dependency "coveralls" diff --git a/spec/support/devise.rb b/spec/support/devise.rb index 5d898b4..0cf56ea 100644 --- a/spec/support/devise.rb +++ b/spec/support/devise.rb @@ -1,4 +1,4 @@ RSpec.configure do |config| - config.include Devise::TestHelpers, :type => :controller - config.include Devise::TestHelpers, :type => :view + config.include Devise::Test::ControllerHelpers, type: :controller + config.include Devise::Test::ControllerHelpers, type: :view end