Skip to content

Commit

Permalink
Update to latest hyrax
Browse files Browse the repository at this point in the history
  • Loading branch information
jcoyne committed Dec 20, 2016
1 parent 1c517bf commit 7498ecb
Show file tree
Hide file tree
Showing 6 changed files with 33 additions and 41 deletions.
46 changes: 23 additions & 23 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ GIT

GIT
remote: https://github.com/projecthydra-labs/hyrax.git
revision: 2ae08abd378c61a9adf6f9fab24f11be4a264733
revision: 5c2df85da6181a2ad18e3d23bc951699f8c3508f
specs:
hyrax (0.0.1.alpha)
active_attr (~> 0.9.0)
Expand Down Expand Up @@ -137,13 +137,13 @@ GEM
execjs
awesome_nested_set (3.1.1)
activerecord (>= 4.0.0, < 5.1)
aws-sdk (2.6.32)
aws-sdk-resources (= 2.6.32)
aws-sdk-core (2.6.32)
aws-sdk (2.6.39)
aws-sdk-resources (= 2.6.39)
aws-sdk-core (2.6.39)
aws-sigv4 (~> 1.0)
jmespath (~> 1.0)
aws-sdk-resources (2.6.32)
aws-sdk-core (= 2.6.32)
aws-sdk-resources (2.6.39)
aws-sdk-core (= 2.6.39)
aws-sigv4 (1.0.0)
babel-source (5.8.35)
babel-transpiler (0.7.0)
Expand Down Expand Up @@ -186,7 +186,7 @@ GEM
builder (3.2.2)
byebug (9.0.6)
cancancan (1.15.0)
capybara (2.10.2)
capybara (2.11.0)
addressable
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
Expand All @@ -206,20 +206,20 @@ GEM
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.11.1)
coffee-script-source (1.12.2)
concurrent-ruby (1.0.3)
concurrent-ruby-ext (1.0.2)
concurrent-ruby (~> 1.0.2)
config (1.3.0)
concurrent-ruby-ext (1.0.3)
concurrent-ruby (= 1.0.3)
config (1.4.0)
activesupport (>= 3.0)
deep_merge (~> 1.1.1)
connection_pool (2.2.1)
coveralls (0.8.16)
coveralls (0.8.17)
json (>= 1.8, < 3)
simplecov (~> 0.12.0)
term-ansicolor (~> 1.3.0)
term-ansicolor (~> 1.3)
thor (~> 0.19.1)
tins (>= 1.6.0, < 2)
tins (~> 1.6)
daemons (1.2.4)
debug_inspector (0.0.2)
deep_merge (1.1.1)
Expand Down Expand Up @@ -278,10 +278,10 @@ GEM
excon (0.54.0)
execjs (2.7.0)
extlib (0.9.16)
factory_girl (4.7.0)
factory_girl (4.8.0)
activesupport (>= 3.0.0)
factory_girl_rails (4.7.0)
factory_girl (~> 4.7.0)
factory_girl_rails (4.8.0)
factory_girl (~> 4.8.0)
railties (>= 3.0.0)
faraday (0.9.2)
multipart-post (>= 1.2, < 3)
Expand All @@ -291,7 +291,7 @@ GEM
ruby-progressbar
flot-rails (0.0.7)
jquery-rails
fog-aws (0.13.0)
fog-aws (1.1.0)
fog-core (~> 1.38)
fog-json (~> 1.0)
fog-xml (~> 0.1)
Expand Down Expand Up @@ -340,7 +340,7 @@ GEM
hamster (3.0.0)
concurrent-ruby (~> 1.0)
hiredis (0.6.1)
honeybadger (2.7.1)
honeybadger (2.7.2)
htmlentities (4.3.4)
httmultiparty (0.3.16)
httparty (>= 0.7.3)
Expand Down Expand Up @@ -652,7 +652,7 @@ GEM
oauth2
ruby-progressbar (1.8.1)
rubyzip (1.2.0)
sass (3.4.22)
sass (3.4.23)
sass-rails (5.0.6)
railties (>= 4.0.0, < 6)
sass (~> 3.1)
Expand Down Expand Up @@ -701,7 +701,7 @@ GEM
stomp
xml-simple
spring (1.7.2)
sprockets (3.7.0)
sprockets (3.7.1)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-es6 (0.9.2)
Expand All @@ -715,7 +715,7 @@ GEM
stomp (1.4.3)
sxp (1.0.0)
rdf (~> 2.0)
term-ansicolor (1.3.2)
term-ansicolor (1.4.0)
tins (~> 1.0)
thor (0.19.4)
thread_safe (0.3.5)
Expand All @@ -737,7 +737,7 @@ GEM
thread_safe (~> 0.1)
uglifier (3.0.4)
execjs (>= 0.3.0, < 3)
unicode-display_width (1.1.1)
unicode-display_width (1.1.2)
useragent (0.16.8)
warden (1.2.6)
rack (>= 1.0)
Expand Down
2 changes: 1 addition & 1 deletion spec/lib/importer/factory/etd_factory_spec.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require 'rails_helper'
require 'importer'

RSpec.describe Importer::Factory::ETDFactory do
RSpec.describe Importer::Factory::ETDFactory, :clean do
let(:factory) { described_class.new(attributes) }

let(:files) { [] }
Expand Down
2 changes: 1 addition & 1 deletion spec/lib/importer/factory/image_factory_spec.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require 'rails_helper'
require 'importer'

RSpec.describe Importer::Factory::ImageFactory do
RSpec.describe Importer::Factory::ImageFactory, :clean do
let(:factory) { described_class.new(attributes) }

let(:files) { [] }
Expand Down
9 changes: 1 addition & 8 deletions spec/lib/importer/mods_importer_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,12 @@
require 'importer'
require 'importer/mods_parser'

RSpec.describe Importer::ModsImporter do
RSpec.describe Importer::ModsImporter, :clean do
let(:image_directory) { 'spec/fixtures/images' }
let(:importer) { described_class.new(image_directory) }

before do
ActiveFedora::Base.find('kx532cb7981').destroy(eradicate: true) if ActiveFedora::Base.exists?('kx532cb7981')
end

describe '#import an image' do
let(:file) { 'spec/fixtures/mods/shpc/druid_xv169dn4538.mods' }
before do
ActiveFedora::Base.find('xv169dn4538').destroy(eradicate: true) if ActiveFedora::Base.exists?('xv169dn4538')
end

it 'creates a new image and a collection' do
image = nil
Expand Down
9 changes: 1 addition & 8 deletions spec/lib/stanford/importer/purl_importer_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,12 @@
require 'importer'
require 'stanford'

RSpec.describe Stanford::Importer::PurlImporter do
RSpec.describe Stanford::Importer::PurlImporter, :clean do
let(:image_directory) { 'spec/fixtures/images' }
let(:importer) { described_class.new(image_directory) }

before do
ActiveFedora::Base.find('kx532cb7981').destroy(eradicate: true) if ActiveFedora::Base.exists?('kx532cb7981')
end

describe '#import an image' do
let(:druid) { 'xv169dn4538' }
before do
ActiveFedora::Base.find('xv169dn4538').destroy(eradicate: true) if ActiveFedora::Base.exists?('xv169dn4538')
end

it 'creates a new image and a collection' do
image = nil
Expand Down
6 changes: 6 additions & 0 deletions spec/rails_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
require 'spec_helper'
require 'rspec/rails'
require 'capybara/rails'

require 'active_fedora/cleaner'
# Add additional requires below this line. Rails is not loaded until this point!

# Requires supporting ruby files with custom matchers and macros, etc, in
Expand Down Expand Up @@ -70,4 +72,8 @@
config.include Devise::Test::ControllerHelpers, type: :controller
config.include Fixtures::FixtureFileUpload
config.include FactoryGirl::Syntax::Methods

config.before :each do |example|
ActiveFedora::Cleaner.clean! if example.metadata[:clean]
end
end

0 comments on commit 7498ecb

Please sign in to comment.