Fix the default branches sorting to actually be 'Last updated'26890-fix-default-branches-sorting

Signed-off-by: Rémy Coutable <remy@rymai.me>

1 files changed, 122 insertions, 62 deletions

diff --git a/spec/features/protected_branches_spec.rb b/spec/features/protected_branches_spec.rb
index 3677bf38724..bf9885f73bd 100644
--- a/spec/features/protected_branches_spec.rb
+++ b/spec/features/protected_branches_spec.rb
@@ -1,93 +1,153 @@
 require 'spec_helper'
 
-feature 'Protected Branches', js: true do
-  let(:user) { create(:user, :admin) }
+feature 'Protected Branches', :js do
+  let(:user) { create(:user) }
+  let(:admin) { create(:admin) }
   let(:project) { create(:project, :repository) }
 
-  before do
-    sign_in(user)
-  end
+  context 'logged in as developer' do
+    before do
+      project.add_developer(user)
+      sign_in(user)
+    end
 
-  def set_protected_branch_name(branch_name)
-    find(".js-protected-branch-select").trigger('click')
-    find(".dropdown-input-field").set(branch_name)
-    click_on("Create wildcard #{branch_name}")
-  end
+    describe 'Delete protected branch' do
+      before do
+        create(:protected_branch, project: project, name: 'fix')
+        expect(ProtectedBranch.count).to eq(1)
+      end
+
+      it 'does not allow developer to removes protected branch' do
+        visit project_branches_path(project)
+
+        fill_in 'branch-search', with: 'fix'
+        find('#branch-search').native.send_keys(:enter)
 
-  describe "explicit protected branches" do
-    it "allows creating explicit protected branches" do
-      visit project_protected_branches_path(project)
-      set_protected_branch_name('some-branch')
-      click_on "Protect"
+        expect(page).to have_css('.btn-remove.disabled')
+      end
+    end
+  end
 
-      within(".protected-branches-list") { expect(page).to have_content('some-branch') }
-      expect(ProtectedBranch.count).to eq(1)
-      expect(ProtectedBranch.last.name).to eq('some-branch')
+  context 'logged in as master' do
+    before do
+      project.add_master(user)
+      sign_in(user)
     end
 
-    it "displays the last commit on the matching branch if it exists" do
-      commit = create(:commit, project: project)
-      project.repository.add_branch(user, 'some-branch', commit.id)
+    describe 'Delete protected branch' do
+      before do
+        create(:protected_branch, project: project, name: 'fix')
+        expect(ProtectedBranch.count).to eq(1)
+      end
 
-      visit project_protected_branches_path(project)
-      set_protected_branch_name('some-branch')
-      click_on "Protect"
+      it 'removes branch after modal confirmation' do
+        visit project_branches_path(project)
 
-      within(".protected-branches-list") { expect(page).to have_content(commit.id[0..7]) }
-    end
+        fill_in 'branch-search', with: 'fix'
+        find('#branch-search').native.send_keys(:enter)
 
-    it "displays an error message if the named branch does not exist" do
-      visit project_protected_branches_path(project)
-      set_protected_branch_name('some-branch')
-      click_on "Protect"
+        expect(page).to have_content('fix')
+        expect(find('.all-branches')).to have_selector('li', count: 1)
+        page.find('[data-target="#modal-delete-branch"]').trigger(:click)
 
-      within(".protected-branches-list") { expect(page).to have_content('branch was removed') }
+        expect(page).to have_css('.js-delete-branch[disabled]')
+        fill_in 'delete_branch_input', with: 'fix'
+        click_link 'Delete protected branch'
+
+        fill_in 'branch-search', with: 'fix'
+        find('#branch-search').native.send_keys(:enter)
+
+        expect(page).to have_content('No branches to show')
+      end
     end
   end
 
-  describe "wildcard protected branches" do
-    it "allows creating protected branches with a wildcard" do
-      visit project_protected_branches_path(project)
-      set_protected_branch_name('*-stable')
-      click_on "Protect"
-
-      within(".protected-branches-list") { expect(page).to have_content('*-stable') }
-      expect(ProtectedBranch.count).to eq(1)
-      expect(ProtectedBranch.last.name).to eq('*-stable')
+  context 'logged in as admin' do
+    before do
+      sign_in(admin)
     end
 
-    it "displays the number of matching branches" do
-      project.repository.add_branch(user, 'production-stable', 'master')
-      project.repository.add_branch(user, 'staging-stable', 'master')
+    describe "explicit protected branches" do
+      it "allows creating explicit protected branches" do
+        visit project_protected_branches_path(project)
+        set_protected_branch_name('some-branch')
+        click_on "Protect"
 
-      visit project_protected_branches_path(project)
-      set_protected_branch_name('*-stable')
-      click_on "Protect"
+        within(".protected-branches-list") { expect(page).to have_content('some-branch') }
+        expect(ProtectedBranch.count).to eq(1)
+        expect(ProtectedBranch.last.name).to eq('some-branch')
+      end
 
-      within(".protected-branches-list") { expect(page).to have_content("2 matching branches") }
+      it "displays the last commit on the matching branch if it exists" do
+        commit = create(:commit, project: project)
+        project.repository.add_branch(admin, 'some-branch', commit.id)
+
+        visit project_protected_branches_path(project)
+        set_protected_branch_name('some-branch')
+        click_on "Protect"
+
+        within(".protected-branches-list") { expect(page).to have_content(commit.id[0..7]) }
+      end
+
+      it "displays an error message if the named branch does not exist" do
+        visit project_protected_branches_path(project)
+        set_protected_branch_name('some-branch')
+        click_on "Protect"
+
+        within(".protected-branches-list") { expect(page).to have_content('branch was removed') }
+      end
     end
 
-    it "displays all the branches matching the wildcard" do
-      project.repository.add_branch(user, 'production-stable', 'master')
-      project.repository.add_branch(user, 'staging-stable', 'master')
-      project.repository.add_branch(user, 'development', 'master')
+    describe "wildcard protected branches" do
+      it "allows creating protected branches with a wildcard" do
+        visit project_protected_branches_path(project)
+        set_protected_branch_name('*-stable')
+        click_on "Protect"
+
+        within(".protected-branches-list") { expect(page).to have_content('*-stable') }
+        expect(ProtectedBranch.count).to eq(1)
+        expect(ProtectedBranch.last.name).to eq('*-stable')
+      end
 
-      visit project_protected_branches_path(project)
-      set_protected_branch_name('*-stable')
-      click_on "Protect"
+      it "displays the number of matching branches" do
+        project.repository.add_branch(admin, 'production-stable', 'master')
+        project.repository.add_branch(admin, 'staging-stable', 'master')
 
-      visit project_protected_branches_path(project)
-      click_on "2 matching branches"
+        visit project_protected_branches_path(project)
+        set_protected_branch_name('*-stable')
+        click_on "Protect"
 
-      within(".protected-branches-list") do
-        expect(page).to have_content("production-stable")
-        expect(page).to have_content("staging-stable")
-        expect(page).not_to have_content("development")
+        within(".protected-branches-list") { expect(page).to have_content("2 matching branches") }
       end
+
+      it "displays all the branches matching the wildcard" do
+        project.repository.add_branch(admin, 'production-stable', 'master')
+        project.repository.add_branch(admin, 'staging-stable', 'master')
+        project.repository.add_branch(admin, 'development', 'master')
+
+        visit project_protected_branches_path(project)
+        set_protected_branch_name('*-stable')
+        click_on "Protect"
+
+        visit project_protected_branches_path(project)
+        click_on "2 matching branches"
+
+        within(".protected-branches-list") do
+          expect(page).to have_content("production-stable")
+          expect(page).to have_content("staging-stable")
+          expect(page).not_to have_content("development")
+        end
+      end
+    end
+
+    describe "access control" do
+      include_examples "protected branches > access control > CE"
     end
   end
 
-  describe "access control" do
-    include_examples "protected branches > access control > CE"
+  def set_protected_branch_name(branch_name)
+    find(".js-protected-branch-select").trigger('click')
+    find(".dropdown-input-field").set(branch_name)
+    click_on("Create wildcard #{branch_name}")
   end
 end