Merge branch 'development'

SpeciesFileGroup · Mar 11, 2020 · daf047e · daf047e
2 parents d234a8e + 9251473
commit daf047e
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/app/javascript/vue/tasks/collection_objects/match/components/InputComponent.vue b/app/javascript/vue/tasks/collection_objects/match/components/InputComponent.vue
@@ -3,7 +3,7 @@
     <textarea
       v-model="text"
       class="full_width"
-      placeholder="Write names..."
+      placeholder="Identifiers, one per line."
       rows="10">
     </textarea>
   </div>

diff --git a/app/javascript/vue/tasks/collection_objects/match/components/LineComponent.vue b/app/javascript/vue/tasks/collection_objects/match/components/LineComponent.vue
@@ -35,7 +35,6 @@
       <div class="flex-separate">
         <template v-if="(Array.isArray(match) && match.length) || Object.keys(match).length">
           <span><b>{{ recordId }}</b></span>
-          <span>{{ Array.isArray(match) ? match.length : Object.keys(match).length }} records.</span>
         </template>
         <template v-else>
           <span>

diff --git a/spec/support/features/authentication_helpers.rb b/spec/support/features/authentication_helpers.rb
@@ -12,6 +12,7 @@ def sign_in_with(email, password)
         click_button 'sign_in'
         find_link('sign_out')  # TODO: check for Capybara bug fix down the road?
       rescue
+        puts "<Current.user_id = #{Current.user_id.inspect}; Current.project_id = #{Current.project_id.inspect}>"
         puts page.body
         raise
       end