summaryrefslogtreecommitdiff
path: root/spec/features
diff options
context:
space:
mode:
authorJacob Schatz <jschatz@gitlab.com>2016-07-15 02:27:21 +0000
committerJacob Schatz <jschatz@gitlab.com>2016-07-15 02:27:21 +0000
commit7cdcb295c71ffec4b8b9c4c9e88d8fd922ec9772 (patch)
tree44189aacd2501f4cf195be754cf0dea2131af77d /spec/features
parentacbcbd4a5bb40358fb74dc11fa77abae000b85c9 (diff)
parentbd888e135d5cd9d7e9ffb6c3a79fc2ce2f56770d (diff)
downloadgitlab-ce-7cdcb295c71ffec4b8b9c4c9e88d8fd922ec9772.tar.gz
Merge branch 'compare-dropdowns' into 'master'
Updated compare dropdowns ## What does this MR do? Removes jQuery autocomplete from compare fields and replaces with GitLabs dropdowns. ## What are the relevant issue numbers? Closes #18891 ## Screenshots (if relevant) ![Screen_Shot_2016-06-24_at_14.24.34](/uploads/f34370390183429f604fc48645390f2f/Screen_Shot_2016-06-24_at_14.24.34.png) See merge request !4895
Diffstat (limited to 'spec/features')
-rw-r--r--spec/features/compare_spec.rb42
1 files changed, 42 insertions, 0 deletions
diff --git a/spec/features/compare_spec.rb b/spec/features/compare_spec.rb
new file mode 100644
index 00000000000..c62556948e0
--- /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: "fea"
+ 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