spec fixes

app/views/layouts/_header.html.haml

@@ -17,6 +17,8 @@
 -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
 -# TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+url_params = defined?(service_request) ? { srid: service_request.try(:id) } : {}
+
 %nav.navbar.navbar-default
   .container-fluid
     .navbar-header
@@ -27,6 +29,6 @@
       - if current_user.present?
         %span
           = I18n.t('proper.navbar.logged_in', email: current_user.email)
-        = link_to t(:proper)[:navbar][:logout], destroy_identity_session_path(srid: service_request.try(:id)), method: :delete, class: 'btn btn-warning'
+        = link_to t(:proper)[:navbar][:logout], destroy_identity_session_path(url_params), method: :delete, class: 'btn btn-warning'
       - else
-        = link_to t(:proper)[:navbar][:login], new_identity_session_path(srid: service_request.try(:id)), class: 'btn btn-primary', id: 'login-link'
+        = link_to t(:proper)[:navbar][:login], new_identity_session_path(url_params), class: 'btn btn-primary', id: 'login-link'