Backported changes from master to 6-7-stable for rubydora 1.7.1+ compatibility #362
Conversation
| @@ -4,10 +4,10 @@ class DigitalObject < Rubydora::DigitalObject | |||
| attr_accessor :original_class | |||
|
|
|||
| module DatastreamBootstrap | |||
| def datastream_object_for dsid, ds_spec=nil | |||
| def datastream_object_for dsid, options={}, ds_spec=nil | |||
There was a problem hiding this comment.
I think its fine. Rubydora had that erasure for a long time. It was probably a bug that they didn't match.
There was a problem hiding this comment.
For the record, rubydora had that erasure since 0.4.0
There was a problem hiding this comment.
OK, then, let's do this, so we can push out a patch release. :)
|
👍 |
| @test_datastream.controlGroup = 'M' | ||
| @test_datastream.dsLocation = "http://example.com/test/content/abcd" | ||
| @test_datastream.validate_content_present.should be_false | ||
| @test_datastream.validate_content_present.should be_true | ||
| @test_datastream.dsLocation = nil |
There was a problem hiding this comment.
@dchandekstark Why are you setting the dislocation to nil here? I'm not familiar with rubydora internals but this seems weird.
There was a problem hiding this comment.
@Cam156 in rubydora 1.7.1+ if controlGroup is M and dsLocation is present then has_content? returns true. This was done b/c Fedora can pull in the content to a managed ds by the url provided in dsLocation. It's reset to nil in the test so it doesn't interfere with the following lines.
Requires rubydora ~> 1.7.4 Fixes #354
|
That test looks way better. 👍 |
Backported changes from master to 6-7-stable for rubydora 1.7.1+ compatibility
Commits commits af2b925 and 4b5f0e6 to 6-7-stable
Requires rubydora ~> 1.7.1
Fixes #354