Merge branch 'fix-compare-diff-unfold' into 'master'

Fix code unfold not working on Compare commits page

### What does this MR do?

The code unfold buttons (`...`) don't work when you go to Commits -> Compare mode. This MR fixes that.

### Are there points in the code the reviewer needs to double check?

Check to make sure all the right initializers are run in the `projects:compare:xxx` case. I'm also not sure if there are other cases where a diff is shown but the code unfolding is not activated.

### What are the relevant issue numbers / [Feature requests](http://feedback.gitlab.com/)?

Closes #1274

See merge request !434

4 files changed, 20 insertions, 0 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 144ada47ec1..f9bd0940a71 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,7 @@ Please view this file on the master branch, on stable branches it's out of date.
 
 v 7.10.0 (unreleased)
   - Allow HTML tags in Markdown input
+  - Fix code unfold not working on Compare commits page (Stan Hu)
   - Include missing events and fix save functionality in admin service template settings form (Stan Hu)
   - Fix "Import projects from" button to show the correct instructions (Stan Hu)
   - Fix dots in Wiki slugs causing errors (Stan Hu)
diff --git a/app/assets/javascripts/dispatcher.js.coffee b/app/assets/javascripts/dispatcher.js.coffee
index deabaf8a784..3535d8c2cfc 100644
--- a/app/assets/javascripts/dispatcher.js.coffee
+++ b/app/assets/javascripts/dispatcher.js.coffee
@@ -28,6 +28,8 @@ class Dispatcher
         new Milestone()
       when 'projects:milestones:new', 'projects:milestones:edit'
         new ZenMode()
+      when 'projects:compare:show'
+        new Diff()
       when 'projects:issues:new','projects:issues:edit'
         GitLab.GfmAutoComplete.setup()
         shortcut_handler = new ShortcutsNavigation()
@@ -115,6 +117,8 @@ class Dispatcher
         new Project()
         new ProjectAvatar()
         switch path[1]
+          when 'compare'
+            shortcut_handler = new ShortcutsNavigation()
           when 'edit'
             shortcut_handler = new ShortcutsNavigation()
             new ProjectNew()
diff --git a/features/project/commits/commits.feature b/features/project/commits/commits.feature
index 46076b6f3e6..c4b206edc95 100644
--- a/features/project/commits/commits.feature
+++ b/features/project/commits/commits.feature
@@ -21,10 +21,13 @@ Feature: Project Commits
     And I click side-by-side diff button
     Then I see inline diff button
 
+  @javascript
   Scenario: I compare refs
     Given I visit compare refs page
     And I fill compare fields with refs
     Then I see compared refs
+    And I unfold diff
+    Then I should see additional file lines
 
   Scenario: I browse commits for a specific path
     Given I visit my project's commits page for a specific path
diff --git a/features/steps/project/commits/commits.rb b/features/steps/project/commits/commits.rb
index b2dccf868b0..57b727f837e 100644
--- a/features/steps/project/commits/commits.rb
+++ b/features/steps/project/commits/commits.rb
@@ -38,6 +38,18 @@ class Spinach::Features::ProjectCommits < Spinach::FeatureSteps
     click_button "Compare"
   end
 
+  step 'I unfold diff' do
+    @diff = first('.js-unfold')
+    @diff.click
+    sleep 2
+  end
+
+  step 'I should see additional file lines' do
+    within @diff.parent do
+      first('.new_line').text.should_not have_content "..."
+    end
+  end
+
   step 'I see compared refs' do
     page.should have_content "Compare View"
     page.should have_content "Commits (1)"