diff --git a/Gemfile b/Gemfile index fffd58bade..b98d1621be 100644 --- a/Gemfile +++ b/Gemfile @@ -34,7 +34,7 @@ gem "simple_form" gem "sprockets", ">= 3.7.2" gem "title" gem "uglifier" -gem "valkyrie", "2.0.0.RC1", github: "samvera-labs/valkyrie", branch: "update_dry_struct_again" +gem "valkyrie", "2.0.0.RC3" gem "valkyrie-derivatives", git: "https://github.com/samvera-labs/valkyrie-derivatives.git" gem "webpacker", ">= 4.0.x" @@ -111,7 +111,7 @@ gem "riiif" gem "sidekiq" gem "string_rtl" gem "tiny_tds" -gem "valkyrie-sequel", github: "samvera-labs/valkyrie-sequel", branch: "valkyrie_1.5" +gem "valkyrie-sequel", github: "samvera-labs/valkyrie-sequel", branch: "valkyrie_2" gem "whenever", "~> 0.10" gem "graphiql-rails", group: :development diff --git a/Gemfile.lock b/Gemfile.lock index c746f5536a..765f3d5679 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -38,37 +38,14 @@ GIT GIT remote: git://github.com/samvera-labs/valkyrie-sequel.git - revision: 902577646f21365c70db446450c1e51572379ba4 - branch: valkyrie_1.5 + revision: 7c4b36d07caae35cfe550b65a7adf8a8f1e1b551 + branch: valkyrie_2 specs: valkyrie-sequel (0.1.0) oj sequel sequel_pg - valkyrie (~> 1.5.0.RC1) - -GIT - remote: git://github.com/samvera-labs/valkyrie.git - revision: a3da11e9785c7628062935a7785ec40cb26fe4cf - branch: update_dry_struct_again - specs: - valkyrie (2.0.0.RC1) - active-triples - activemodel - activerecord - activesupport - draper - dry-struct - dry-types (~> 0.13.0) - json - json-ld - ldp - pg - railties - rdf - reform - reform-rails - rsolr + valkyrie (~> 2.0.0.RC3) GIT remote: git://github.com/yob/pdf-reader.git @@ -325,7 +302,7 @@ GEM concurrent-ruby (~> 1.0) dry-equalizer (0.2.1) dry-inflector (0.1.2) - dry-logic (0.4.2) + dry-logic (0.5.0) dry-container (~> 0.2, >= 0.2.6) dry-core (~> 0.2) dry-equalizer (~> 0.2) @@ -788,6 +765,22 @@ GEM unf_ext (0.0.7.5) unicode-display_width (1.3.0) validatable (1.6.7) + valkyrie (2.0.0.RC3) + active-triples + activemodel + activerecord + activesupport + draper + dry-struct + dry-types (~> 0.13.0) + json + json-ld + ldp + railties + rdf + reform + reform-rails + rsolr warden (1.2.7) rack (>= 1.0) web-console (3.5.1) @@ -908,7 +901,7 @@ DEPENDENCIES tiny_tds title uglifier - valkyrie (= 2.0.0.RC1)! + valkyrie (= 2.0.0.RC3) valkyrie-derivatives! valkyrie-sequel! web-console diff --git a/spec/features/playlist_spec.rb b/spec/features/playlist_spec.rb index dfb92c801a..b116bbed84 100644 --- a/spec/features/playlist_spec.rb +++ b/spec/features/playlist_spec.rb @@ -50,11 +50,11 @@ playlist_members_elements = doc.xpath("//playlist-members[@resource-id='#{resource.id}']") expect(playlist_members_elements).not_to be_empty playlist_members_element = playlist_members_elements.first - expect(playlist_members_element.attributes[":members"].value).to eq json_fixture(resource.decorate.decorated_proxies.first, recording) + expect(JSON.parse(playlist_members_element.attributes[":members"].value)).to eq JSON.parse(json_fixture(resource.decorate.decorated_proxies.first, recording)) end end def json_fixture(decorated_resource, recording) - "[{\"id\":{\"id\":\"#{decorated_resource.id}\"},\"internal_resource\":\"ProxyFileSet\",\"created_at\":\"#{decorated_resource.created_at}\",\"updated_at\":\"#{decorated_resource.updated_at}\",\"new_record\":false,\"read_groups\":[],\"read_users\":[],\"edit_users\":[],\"edit_groups\":[],\"label\":[\"audio_file.wav\"],\"visibility\":[],\"proxied_file_id\":{\"id\":\"#{decorated_resource.proxied_file_id}\"},\"local_identifier\":null,\"recording_url\":\"http://www.example.com/catalog/#{recording.id}\",\"recording_title\":\"#{recording.title.first}\"}]" + "[{\"id\":{\"id\":\"#{decorated_resource.id}\"},\"created_at\":\"#{decorated_resource.created_at}\",\"updated_at\":\"#{decorated_resource.updated_at}\",\"internal_resource\":\"ProxyFileSet\",\"new_record\":false,\"read_groups\":[],\"read_users\":[],\"edit_users\":[],\"edit_groups\":[],\"label\":[\"audio_file.wav\"],\"visibility\":[],\"proxied_file_id\":{\"id\":\"#{decorated_resource.proxied_file_id}\"},\"local_identifier\":null,\"recording_url\":\"http://www.example.com/catalog/#{recording.id}\",\"recording_title\":\"#{recording.title.first}\"}]" end end