From d7450946a75a5e344bf996542114ab0499f6a7fa Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Wed, 29 Jun 2016 11:24:58 +0100
Subject: [PATCH] Added tests for compare dropdowns CHANGELOG

---
 CHANGELOG                     |  2 ++
 spec/features/compare_spec.rb | 42 +++++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+)
 create mode 100644 spec/features/compare_spec.rb

diff --git a/CHANGELOG b/CHANGELOG
index 09f2c44e02..325db5b565 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -19,6 +19,8 @@ v 8.10.0 (unreleased)
   - Fix issue, preventing users w/o push access to sort tags !5105 (redetection)
   - Add Spring EmojiOne updates.
   - Fix viewing notification settings when a project is pending deletion
+  - Updated compare dropdown menus to use GL dropdown
+  - Eager load award emoji on notes
   - Fix pagination when sorting by columns with lots of ties (like priority)
   - Updated project header design
   - Exclude email check from the standard health check
diff --git a/spec/features/compare_spec.rb b/spec/features/compare_spec.rb
new file mode 100644
index 0000000000..faffe31491
--- /dev/null
+++ b/spec/features/compare_spec.rb
@@ -0,0 +1,42 @@
+require "spec_helper"
+
+describe "Compare", js: true do
+  let(:user)    { create(:user) }
+  let(:project) { create(:project) }
+
+  before do
+    project.team << [user, :master]
+    login_as user
+    visit namespace_project_compare_index_path(project.namespace, project, from: "master", to: "master")
+  end
+
+  describe "branches" do
+    it "should pre-populate fields" do
+      expect(page.find_field("from").value).to eq("master")
+    end
+
+    it "should compare branches" do
+      fill_in "from", with: "mast"
+      find("#from").click
+
+      click_link "feature"
+      expect(page.find_field("from").value).to eq("feature")
+
+      click_button "Compare"
+      expect(page).to have_content "Commits"
+    end
+  end
+
+  describe "tags" do
+    it "should compare tags" do
+      fill_in "from", with: "v1.0"
+      find("#from").click
+
+      click_link "v1.0.0"
+      expect(page.find_field("from").value).to eq("v1.0.0")
+
+      click_button "Compare"
+      expect(page).to have_content "Commits"
+    end
+  end
+end
-- 
2.30.9