From ed0f26c223b5182fa2cb7a54bfd8ce155948deb2 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Wed, 8 Jun 2016 12:53:40 +0100
Subject: Escapes branch names before appending to dom

---
 app/assets/javascripts/project.js.coffee      | 2 +-
 features/steps/project/source/browse_files.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/project.js.coffee b/app/assets/javascripts/project.js.coffee
index 3ef5fcc636c..3b608cbd2a0 100644
--- a/app/assets/javascripts/project.js.coffee
+++ b/app/assets/javascripts/project.js.coffee
@@ -74,7 +74,7 @@ class @Project
             isActiveClass = if ref is selected then 'is-active' else ''
 
             "<li>
-              <a href='#' data-ref='#{ref}' class='#{isActiveClass}'>
+              <a href='#' data-ref='#{escape(ref)}' class='#{isActiveClass}'>
                 #{ref}
               </a>
             </li>"
diff --git a/features/steps/project/source/browse_files.rb b/features/steps/project/source/browse_files.rb
index 1c2567dae73..0fe046dcbf6 100644
--- a/features/steps/project/source/browse_files.rb
+++ b/features/steps/project/source/browse_files.rb
@@ -306,7 +306,7 @@ class Spinach::Features::ProjectSourceBrowseFiles < Spinach::FeatureSteps
   end
 
   step "I see the ref 'test' has been selected" do
-    expect(page).to have_selector '.dropdown-toggle', text: "'test'"
+    expect(page).to have_selector '.dropdown-toggle-text', text: "'test'"
   end
 
   step "I visit the 'test' tree" do
-- 
cgit v1.2.1