Skip to content

Commit

Permalink
Merge branch 'development' into 1096-user-dictation-langauge
Browse files Browse the repository at this point in the history
  • Loading branch information
@benwbrum
benwbrum committed Jul 29, 2018
2 parents 937711b + 1fb7935 commit 28d7f66
Show file tree
Hide file tree
Showing 2 changed files with 61 additions and 60 deletions.
102 changes: 51 additions & 51 deletions Gemfile.lock
View file
@@ -1,6 +1,6 @@
GIT
remote: https://github.com/benwbrum/omeka_client
revision: ff34cc375a1ebd946956bcad43e0df647dc09b02
revision: f930e4a32ff5f235760f0ba64804ce7beeca9546
specs:
omeka_client (1.0.0.a)
net-http-persistent (~> 2.9.4)
Expand Down Expand Up @@ -55,7 +55,7 @@ GEM
minitest (~> 5.1)
thread_safe (~> 0.1)
tzinfo (~> 1.1)
acts_as_list (0.9.10)
acts_as_list (0.9.15)
activerecord (>= 3.0)
acts_as_tree (2.7.1)
activerecord (>= 3.0.0)
Expand All @@ -78,10 +78,10 @@ GEM
arel (5.0.1.20140414130214)
autoprefixer-rails (8.6.5)
execjs
bcrypt (3.1.11)
browser (2.5.2)
bcrypt (3.1.12)
browser (2.5.3)
builder (3.2.3)
byebug (10.0.0)
byebug (10.0.2)
callsite (0.0.11)
capistrano (3.4.1)
i18n
Expand All @@ -103,13 +103,13 @@ GEM
capybara-webkit (1.15.0)
capybara (>= 2.3, < 4.0)
json
carrierwave (1.2.2)
carrierwave (1.2.3)
activemodel (>= 4.0.0)
activesupport (>= 4.0.0)
mime-types (>= 1.16)
coderay (1.1.2)
concurrent-ruby (1.0.5)
database_cleaner (1.6.2)
database_cleaner (1.7.0)
devise (3.4.1)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
Expand All @@ -119,49 +119,47 @@ GEM
warden (~> 1.2.3)
devise-encryptable (0.2.0)
devise (>= 2.1.0)
devise_masquerade (0.6.1)
devise_masquerade (0.6.2)
devise (>= 2.1.0)
railties (>= 3.0)
diff-lcs (1.3)
domain_name (0.5.20170404)
domain_name (0.5.20180417)
unf (>= 0.0.5, < 1.0.0)
errbase (0.0.3)
errbase (0.1.0)
erubis (2.7.0)
execjs (2.7.0)
faraday (0.14.0)
faraday (0.12.2)
multipart-post (>= 1.2, < 3)
faraday_middleware (0.12.2)
faraday (>= 0.7.4, < 1.0)
ffi (1.9.23)
friendly_id (5.2.3)
ffi (1.9.25)
friendly_id (5.2.4)
activerecord (>= 4.0.0)
geocoder (1.4.5)
geocoder (1.4.9)
gravatar_image_tag (1.2.0)
gyoku (1.3.1)
builder (>= 2.1.2)
hashie (3.5.7)
http-cookie (1.0.3)
domain_name (~> 0.5)
httpauth (0.2.1)
httpi (2.4.3)
rack
socksify
i18n (0.9.5)
concurrent-ruby (~> 1.0)
iso-639 (0.2.8)
jquery-rails (3.1.4)
jquery-rails (3.1.5)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.8.6)
jwt (0.1.13)
multi_json (>= 1.5)
jwt (1.5.6)
launchy (2.4.3)
addressable (~> 2.3)
libv8 (3.16.14.19)
mail (2.5.5)
mime-types (~> 1.16)
treetop (~> 1.4.8)
meta_request (0.5.0)
meta_request (0.6.0)
callsite (~> 0.0, >= 0.0.11)
rack-contrib (>= 1.1, < 3)
railties (>= 3.0.0, < 6)
Expand All @@ -171,34 +169,36 @@ GEM
mini_portile2 (2.3.0)
minitest (5.11.3)
multi_json (1.13.1)
multi_xml (0.6.0)
multipart-post (2.0.0)
mysql2 (0.3.21)
net-http-persistent (2.9.4)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
net-ssh (4.2.0)
net-ssh (5.0.2)
netrc (0.11.0)
nokogiri (1.8.2)
nokogiri (1.8.4)
mini_portile2 (~> 2.3.0)
nori (2.6.0)
oauth2 (0.8.1)
faraday (~> 0.8)
httpauth (~> 0.1)
jwt (~> 0.1.4)
multi_json (~> 1.0)
rack (~> 1.2)
oauth2 (1.4.0)
faraday (>= 0.8, < 0.13)
jwt (~> 1.0)
multi_json (~> 1.3)
multi_xml (~> 0.5)
rack (>= 1.2, < 3)
omniauth (1.4.2)
hashie (>= 1.2, < 4)
rack (>= 1.0, < 3)
omniauth-google-oauth2 (0.2.6)
omniauth (> 1.0)
omniauth-oauth2 (~> 1.1)
omniauth-oauth2 (1.1.1)
oauth2 (~> 0.8.0)
omniauth (~> 1.0)
omniauth-saml (1.9.0)
omniauth-google-oauth2 (0.5.3)
jwt (>= 1.5)
omniauth (>= 1.1.1)
omniauth-oauth2 (>= 1.5)
omniauth-oauth2 (1.5.0)
oauth2 (~> 1.1)
omniauth (~> 1.2)
omniauth-saml (1.10.1)
omniauth (~> 1.3, >= 1.3.2)
ruby-saml (~> 1.4, >= 1.4.3)
ruby-saml (~> 1.7)
orm_adapter (0.5.0)
polyglot (0.3.5)
protected_attributes (1.1.4)
Expand All @@ -211,8 +211,8 @@ GEM
pry (~> 0.10)
public_suffix (3.0.2)
rack (1.5.5)
rack-attack (5.0.1)
rack
rack-attack (5.4.0)
rack (>= 1.0, < 3)
rack-contrib (1.8.0)
rack (~> 1.4)
rack-test (0.6.3)
Expand All @@ -232,15 +232,15 @@ GEM
activesupport (= 4.1.2)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (12.3.0)
rb-fsevent (0.10.2)
rake (12.3.1)
rb-fsevent (0.10.3)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
recaptcha (0.3.6)
recursive-open-struct (0.4.5)
ref (2.0.0)
referer-parser (0.3.0)
request_store (1.4.0)
request_store (1.4.1)
rack (>= 1.4)
responders (1.1.2)
railties (>= 3.2, < 4.2)
Expand Down Expand Up @@ -272,15 +272,15 @@ GEM
rspec-support (~> 3.7.0)
rspec-support (3.7.1)
rtl (0.2.3)
ruby-saml (1.6.1)
ruby-saml (1.8.0)
nokogiri (>= 1.5.10)
rubyzip (1.2.1)
rvm1-capistrano3 (1.4.0)
capistrano (~> 3.0)
sshkit (>= 1.2)
safely_block (0.2.1)
errbase
sass (3.5.5)
sass (3.5.7)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
Expand All @@ -299,24 +299,24 @@ GEM
nokogiri (>= 1.8.1)
nori (~> 2.4)
wasabi (~> 3.4)
shoulda (3.5.0)
shoulda (3.6.0)
shoulda-context (~> 1.0, >= 1.0.1)
shoulda-matchers (>= 1.4.1, < 3.0)
shoulda-matchers (~> 3.0)
shoulda-context (1.2.2)
shoulda-matchers (2.8.0)
activesupport (>= 3.0.0)
shoulda-matchers (3.1.2)
activesupport (>= 4.0.0)
slim (3.0.9)
temple (>= 0.7.6, < 0.9)
tilt (>= 1.3.3, < 2.1)
socksify (1.7.1)
sprockets (3.7.1)
sprockets (3.7.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (2.3.3)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
sshkit (1.16.0)
sshkit (1.17.0)
net-scp (>= 1.1.2)
net-ssh (>= 2.8.0)
temple (0.8.0)
Expand All @@ -331,7 +331,7 @@ GEM
polyglot (>= 0.3.1)
tzinfo (1.2.5)
thread_safe (~> 0.1)
uglifier (4.1.6)
uglifier (4.1.17)
execjs (>= 0.3.0, < 3)
unf (0.1.4)
unf_ext
Expand All @@ -344,7 +344,7 @@ GEM
httpi (~> 2.0)
nokogiri (>= 1.4.2)
will_paginate (3.1.6)
xpath (3.0.0)
xpath (3.1.0)
nokogiri (~> 1.8)

PLATFORMS
Expand Down Expand Up @@ -398,4 +398,4 @@ DEPENDENCIES
will_paginate

BUNDLED WITH
1.16.2
1.16.3
19 changes: 10 additions & 9 deletions spec/features/zz_iiif_collection_spec.rb
View file
Expand Up @@ -5,7 +5,7 @@

before :all do
@owner = User.find_by(login: OWNER)
@at_id = "https://textgridlab.org/1.0/iiif/manifests/collection/published.json"
@at_id = "https://iiif.durham.ac.uk/manifests/trifle/collection/32150/t2c0g354f205"
end

before :each do
Expand Down Expand Up @@ -34,21 +34,22 @@
expect(page.find('.flash_message')).to have_content("IIIF collection import is processing")
expect(page).to have_content("Works")
sleep(15)
expect(Collection.last.title).to have_content("TextGrid")
expect(Collection.last.title).to have_content("Library")
expect(Collection.last.works.count).not_to be_nil
end

it "checks to allow '.' in IIIF domain URL parameter" do
visit "/iiif/contributions/textgridlab.org"
expect(page).to have_content("textgridlab")
visit "/iiif/contributions/textgridlab.org/2018-01-01"
expect(page).to have_content("textgridlab")
visit "/iiif/contributions/textgridlab.org/2018-01-01/2018-12-31"
expect(page).to have_content("textgridlab")
visit "iiif/contributions/ac.uk"
expect(page).to have_content("resources")
visit "/iiif/contributions/ac.uk/2018-01-01"
expect(page).to have_content("ac.uk")
visit "/iiif/contributions/ac.uk/2018-01-01/2019-12-31"
expect(page).to have_content("ac.uk")
end

it "tests for transcribed works" do
col = Collection.second
col = Collection.where(:title => 'Cosin\'s Library').first
sleep(30)
works = col.works
works.each do |w|
w.pages.update_all(status: Page::STATUS_TRANSCRIBED, translation_status: Page::STATUS_TRANSLATED)
Expand Down

0 comments on commit 28d7f66

Please sign in to comment.