Diff
Added: branches/packs/test/fixtures/research_objects.yml (0 => 3779)
--- branches/packs/test/fixtures/research_objects.yml (rev 0)
+++ branches/packs/test/fixtures/research_objects.yml 2013-11-12 13:12:55 UTC (rev 3779)
@@ -0,0 +1,40 @@
+research_object_1:
+ id: 1
+ slug: Pack1
+ user_id: 1
+ context_type: Pack
+ context_id: 1
+ created_at: 2008-05-05 05:05:05
+
+research_object_2:
+ id: 2
+ slug: Pack2
+ user_id: 1
+ context_type: Pack
+ context_id: 2
+ created_at: 2008-05-05 05:05:08
+
+research_object_3:
+ id: 3
+ slug: Pack3
+ user_id: 1
+ context_type: Pack
+ context_id: 3
+ created_at: 2008-05-05 05:05:11
+
+research_object_4:
+ id: 4
+ slug: Pack4
+ user_id: 1
+ context_type: Pack
+ context_id: 4
+ created_at: 2008-05-05 05:05:14
+
+research_object_5:
+ id: 5
+ slug: Pack5
+ user_id: 1
+ context_type: Pack
+ context_id: 5
+ created_at: 2008-05-05 05:05:17
+
Added: branches/packs/test/fixtures/resources.yml (0 => 3779)
--- branches/packs/test/fixtures/resources.yml (rev 0)
+++ branches/packs/test/fixtures/resources.yml 2013-11-12 13:12:55 UTC (rev 3779)
@@ -0,0 +1,40 @@
+resource_1:
+
+ id: 1
+ research_object_id: 1
+ path: .ro/manifest.rdf
+ created_at: 2008-05-05 07:15:08
+ uuid: 8d995d0d-fb9c-42c4-978d-68b7d26ce126
+
+resource_2:
+
+ id: 2
+ research_object_id: 2
+ path: .ro/manifest.rdf
+ created_at: 2008-05-05 07:15:09
+ uuid: 8d995d0d-fb9c-42c4-978d-68b7d26ce127
+
+resource_3:
+
+ id: 3
+ research_object_id: 3
+ path: .ro/manifest.rdf
+ created_at: 2008-05-05 07:15:10
+ uuid: 8d995d0d-fb9c-42c4-978d-68b7d26ce128
+
+resource_1:
+
+ id: 4
+ research_object_id: 4
+ path: .ro/manifest.rdf
+ created_at: 2008-05-05 07:15:11
+ uuid: 8d995d0d-fb9c-42c4-978d-68b7d26ce129
+
+resource_1:
+
+ id: 5
+ research_object_id: 5
+ path: .ro/manifest.rdf
+ created_at: 2008-05-05 07:15:12
+ uuid: 8d995d0d-fb9c-42c4-978d-68b7d26ce12a
+
Modified: branches/packs/test/functional/api_controller_test.rb (3778 => 3779)
--- branches/packs/test/functional/api_controller_test.rb 2013-11-12 13:01:08 UTC (rev 3778)
+++ branches/packs/test/functional/api_controller_test.rb 2013-11-12 13:12:55 UTC (rev 3779)
@@ -48,9 +48,9 @@
extra_activities = Activity.find(:all). - existing_activities
assert_equal(1, extra_workflows.length)
- assert_equal(1, extra_activities.length)
+ assert_equal(2, extra_activities.length)
- new_activity = (extra_activities - existing_activities).first
+ new_activity = (extra_activities - existing_activities)[1]
assert_equal("John Smith", new_activity.subject_label);
assert_equal("create", new_activity.action);
@@ -245,11 +245,11 @@
new_activities = Activity.all - existing_activities
- assert_equal(1, new_activities.length)
+ assert_equal(2, new_activities.length)
- assert_equal("John Smith", new_activities.first.subject.name)
- assert_equal("create", new_activities.first.action)
- assert_equal(title, new_activities.first.objekt.title)
+ assert_equal("John Smith", new_activities[1].subject.name)
+ assert_equal("create", new_activities[1].action)
+ assert_equal(title, new_activities[1].objekt.title)
extra_files = Blob.find(:all) - existing_files
Modified: branches/packs/test/functional/research_objects_test.rb (3778 => 3779)
--- branches/packs/test/functional/research_objects_test.rb 2013-11-12 13:01:08 UTC (rev 3778)
+++ branches/packs/test/functional/research_objects_test.rb 2013-11-12 13:12:55 UTC (rev 3779)
@@ -21,12 +21,19 @@
ro_uri = research_object_url('test_ro') + "/"
manifest_uri = ro_uri + ResearchObject::MANIFEST_PATH
- # Test that the index of research objects is empty.
+ # Test that the index of research objects equals the test packs
get research_objects_path
+ fixture_ros =
+ "http://test.host/rodl/ROs/Pack1/\n" +
+ "http://test.host/rodl/ROs/Pack2/\n" +
+ "http://test.host/rodl/ROs/Pack3/\n" +
+ "http://test.host/rodl/ROs/Pack4/\n" +
+ "http://test.host/rodl/ROs/Pack5/\n"
+
assert_response :ok
- assert_equal "", @response.body
+ assert_equal fixture_ros, @response.body
assert_equal "text/uri-list", @response.content_type
# Create a research object.
@@ -47,7 +54,7 @@
get research_objects_path
assert_response :ok
- assert_equal "#{ro_uri}\n", @response.body
+ assert_equal "#{fixture_ros}#{ro_uri}\n", @response.body
assert_equal "text/uri-list", @response.content_type
# Test the manifest redirection.
@@ -165,8 +172,7 @@
get proxy_uri
- assert_response :ok
- assert_equal "application/vnd.wf4ever.proxy", @response.content_type.to_s
+ assert_response :see_other
graph2 = RDF::Graph.new
graph2 << RDF::Reader.for(:rdfxml).new(@response.body)