Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc43

2 files changed, 8 insertions, 5 deletions

diff --git a/spec/features/projects/branches/user_creates_branch_spec.rb b/spec/features/projects/branches/user_creates_branch_spec.rb
index 52c860bfe36..18d083f7d88 100644
--- a/spec/features/projects/branches/user_creates_branch_spec.rb
+++ b/spec/features/projects/branches/user_creates_branch_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe "User creates branch", :js do
   end
 
   it "creates new branch" do
-    branch_name = "deploy_keys".freeze
+    branch_name = "deploy_keys"
 
     create_branch(branch_name)
 
@@ -25,7 +25,7 @@ RSpec.describe "User creates branch", :js do
 
   context "when branch name is invalid" do
     it "does not create new branch" do
-      invalid_branch_name = "1.0 stable".freeze
+      invalid_branch_name = "1.0 stable"
 
       fill_in("branch_name", with: invalid_branch_name)
       page.find("body").click # defocus the branch_name input
diff --git a/spec/features/projects/branches/user_deletes_branch_spec.rb b/spec/features/projects/branches/user_deletes_branch_spec.rb
index c480c41709c..bebb4bb679b 100644
--- a/spec/features/projects/branches/user_deletes_branch_spec.rb
+++ b/spec/features/projects/branches/user_deletes_branch_spec.rb
@@ -9,12 +9,15 @@ RSpec.describe "User deletes branch", :js do
   before do
     project.add_developer(user)
     sign_in(user)
-
-    visit(project_branches_path(project))
   end
 
   it "deletes branch" do
-    fill_in("branch-search", with: "improve/awesome").native.send_keys(:enter)
+    visit(project_branches_path(project))
+
+    branch_search = find('input[data-testid="branch-search"]')
+
+    branch_search.set('improve/awesome')
+    branch_search.native.send_keys(:enter)
 
     page.within(".js-branch-improve\\/awesome") do
       accept_alert { find(".btn-danger").click }