Permalink
Browse files

Merge branch 'development'

  • Loading branch information...
mjy committed Dec 5, 2018
2 parents d732813 + 784a6b0 commit 04cb882b324beb2b3810e9f188e76bd8fc962874
@@ -3,7 +3,11 @@ class Tasks::Serials::SimilarController < ApplicationController
# GET tasks/serials/like/:id
def like
@serial = Serial.find(params[:id])
if params[:id]
@serial = Serial.find(params[:id])
else
@serial = Serial.first
end
end
end
@@ -9,7 +9,7 @@ module Shared::Observations
has_many :observations, inverse_of: class_name, dependent: :restrict_with_error
has_many :observation_matrix_rows, inverse_of: class_name
has_many :observation_matrix_row_items, inverse_of: class_name
has_many :observation_matrices, inverse_of: class_name, through: :observation_matrix_rows
has_many :observation_matrices, inverse_of: class_name.pluralize, through: :observation_matrix_rows
has_many :descriptors, through: :observations
end
@@ -44,7 +44,8 @@ within_locality_task:
name:
similar_serials_task:
hub: true
name:
name: 'Similar serials'
description: 'Navigate between related serials, and their annotations.'
related:
- serials
categories:
@@ -4,8 +4,10 @@ module AuthenticationHelpers
def sign_in_with(email, password)
visit signin_path
fill_in 'session[email]', with: email, id: 'session_email'
fill_in 'session[password]', with: password, id: 'session_password'
find('#session_email').set(email)
find('#session_password').set(password)
# fill_in 'session[email]', with: email, id: 'session_email'
# fill_in 'session[password]', with: password, id: 'session_password'
click_button 'sign_in'
find_link('sign_out') # TODO: check for Capybara bug fix down the road?
end
@@ -62,3 +64,4 @@ def spin_up_project_and_users
end
end
end

0 comments on commit 04cb882

Please sign in to comment.