2872: Fix tests broken in merge.

diff --git a/apps/workbench/app/controllers/projects_controller.rb b/apps/workbench/app/controllers/projects_controller.rb
index f73b6c074cd14d75b6d8c4d0071a291b1d298532..89a50b29bf093dac5fb59db3fe4081fa44a5e515 100644 (file)
--- a/apps/workbench/app/controllers/projects_controller.rb
+++ b/apps/workbench/app/controllers/projects_controller.rb
@@ -91,6 +91,9 @@ class ProjectsController < ApplicationController
   end
 
   def show
+    if !@object
+      return render_not_found("object not found")
+    end
     @objects = @object.contents(limit: 50,
                                 include_linked: true,
                                 offset: params[:offset] || 0)

diff --git a/apps/workbench/app/views/application/_content.html.erb b/apps/workbench/app/views/application/_content.html.erb
index b7f27df3d79539bbe7c01b86dadbf0303160dc78..0cd3a2c21d2fac4b51aacd801fde005984e22d82 100644 (file)
--- a/apps/workbench/app/views/application/_content.html.erb
+++ b/apps/workbench/app/views/application/_content.html.erb
@@ -26,7 +26,7 @@
     if (!tab_pane_valid_state[pane]) {
       tab_pane_valid_state[pane] = true;
       $(document).trigger('ajax:send');
-      $.ajax('<%=j url_for @object %>?tab_pane='+pane, {dataType: 'html', type: 'GET'}).
+      $.ajax('<%=j url_for() %>?tab_pane='+pane, {dataType: 'html', type: 'GET'}).
         done(function(data, status, jqxhr) {
           $('#' + pane + ' > div > div').html(data);
           $(document).trigger('ajax:complete');

diff --git a/apps/workbench/app/views/collections/show.html.erb b/apps/workbench/app/views/collections/show.html.erb
index f91357b12067b4f4662bdfaebd6cf3ccfac81490..bf2e7aa6a7d44c21efb1390af782e94a69aa9056 100644 (file)
--- a/apps/workbench/app/views/collections/show.html.erb
+++ b/apps/workbench/app/views/collections/show.html.erb
@@ -4,7 +4,7 @@
       <div class="panel-heading">
        <h3 class="panel-title">
           <% i = 0 %>
-            <% @folder_links.each do |l| %>
+            <% @project_links.each do |l| %>
               <%= if i > 0 then ', ' end %>
               <% i += 1 %>
               <%= l.name %>

diff --git a/apps/workbench/app/views/layouts/application.html.erb b/apps/workbench/app/views/layouts/application.html.erb
index ec26409ca6a193125a7594a8f1808b1b5ea12487..c42abfe11857c239a3b3d3700ac8aaf1655f76fd 100644 (file)
--- a/apps/workbench/app/views/layouts/application.html.erb
+++ b/apps/workbench/app/views/layouts/application.html.erb
@@ -99,8 +99,8 @@
           </li>
           <% end %>
 
-          <li class="dropdown notification-menu">
-            <a href="#" class="dropdown-toggle" data-toggle="dropdown" id="collections-menu">
+          <li class="dropdown selection-menu">
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown">
               <span class="fa fa-lg fa-paperclip"></span>
               <span class="badge" id="persistent-selection-count"></span>
             </a>

diff --git a/apps/workbench/test/integration/pipeline_instances_test.rb b/apps/workbench/test/integration/pipeline_instances_test.rb
index f0620cb7e8ac7f1e7e0e9911e884b6c536498d2d..a85fd996fc50185e6ece4d57c4061975b1462f25 100644 (file)
--- a/apps/workbench/test/integration/pipeline_instances_test.rb
+++ b/apps/workbench/test/integration/pipeline_instances_test.rb
@@ -96,7 +96,7 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
     visit '/projects'
     find('.arv-project-list a,button', text: 'A Project').click
 
-    find('#collections-menu').click
+    find('li.selection-menu > a').click
     click_button 'Copy selections into this project'
 
     # create a pipeline instance

diff --git a/services/api/test/fixtures/links.yml b/services/api/test/fixtures/links.yml
index 397659e46d0dc59b6c56b0f3a5eef3014cf45ff1..1729bd227413c1d410b3a3be24825beecf723be2 100644 (file)
--- a/services/api/test/fixtures/links.yml
+++ b/services/api/test/fixtures/links.yml
@@ -247,7 +247,7 @@ foo_repository_writable_by_active:
   tail_uuid: zzzzz-tpzed-xurymjxw79nv3jz
   link_class: permission
   name: can_write
-  head_uuid: zzzzz-2x53u-382brsig8rp3666
+  head_uuid: zzzzz-s0uqq-382brsig8rp3666
   properties: {}
 
 miniadmin_user_is_a_testusergroup_admin: