4 files changed, 98 insertions, 36 deletions
diff --git a/qa/qa/specs/features/api/basics_spec.rb b/qa/qa/specs/features/api/basics_spec.rb
new file mode 100644
index 00000000000..1d7f9d6a03c
--- /dev/null
+++ b/qa/qa/specs/features/api/basics_spec.rb
@@ -0,0 +1,61 @@
+require 'securerandom'
+
+module QA
+  feature 'API basics', :core do
+    before(:context) do
+      @api_client = Runtime::API::Client.new(:gitlab)
+    end
+
+    let(:project_name) { "api-basics-#{SecureRandom.hex(8)}" }
+    let(:sanitized_project_path) { CGI.escape("#{Runtime::User.name}/#{project_name}") }
+
+    scenario 'user creates a project with a file and deletes them afterwards' do
+      create_project_request = Runtime::API::Request.new(@api_client, '/projects')
+      post create_project_request.url, path: project_name, name: project_name
+
+      expect_status(201)
+      expect(json_body).to match(
+        a_hash_including(name: project_name, path: project_name)
+      )
+
+      create_file_request = Runtime::API::Request.new(@api_client, "/projects/#{sanitized_project_path}/repository/files/README.md")
+      post create_file_request.url, branch: 'master', content: 'Hello world', commit_message: 'Add README.md'
+
+      expect_status(201)
+      expect(json_body).to match(
+        a_hash_including(branch: 'master', file_path: 'README.md')
+      )
+
+      get_file_request = Runtime::API::Request.new(@api_client, "/projects/#{sanitized_project_path}/repository/files/README.md", ref: 'master')
+      get get_file_request.url
+
+      expect_status(200)
+      expect(json_body).to match(
+        a_hash_including(
+          ref: 'master',
+          file_path: 'README.md', file_name: 'README.md',
+          encoding: 'base64', content: 'SGVsbG8gd29ybGQ='
+        )
+      )
+
+      delete_file_request = Runtime::API::Request.new(@api_client, "/projects/#{sanitized_project_path}/repository/files/README.md", branch: 'master', commit_message: 'Remove README.md')
+      delete delete_file_request.url
+
+      expect_status(204)
+
+      get_tree_request = Runtime::API::Request.new(@api_client, "/projects/#{sanitized_project_path}/repository/tree")
+      get get_tree_request.url
+
+      expect_status(200)
+      expect(json_body).to eq([])
+
+      delete_project_request = Runtime::API::Request.new(@api_client, "/projects/#{sanitized_project_path}")
+      delete delete_project_request.url
+
+      expect_status(202)
+      expect(json_body).to match(
+        a_hash_including(message: '202 Accepted')
+      )
+    end
+  end
+end
diff --git a/qa/qa/specs/features/api/users_spec.rb b/qa/qa/specs/features/api/users_spec.rb
index 38f4c497183..0aecf89e1b7 100644
--- a/qa/qa/specs/features/api/users_spec.rb
+++ b/qa/qa/specs/features/api/users_spec.rb
@@ -31,7 +31,7 @@ module QA
     end
 
     scenario 'submit request with an invalid token' do
-      request = Runtime::API::Request.new(@api_client, '/users', personal_access_token: 'invalid')
+      request = Runtime::API::Request.new(@api_client, '/users', private_token: 'invalid')
 
       get request.url
 
diff --git a/qa/qa/specs/features/project/deploy_key_clone_spec.rb b/qa/qa/specs/features/project/deploy_key_clone_spec.rb
index 442ac312b4d..46b3e38c1c5 100644
--- a/qa/qa/specs/features/project/deploy_key_clone_spec.rb
+++ b/qa/qa/specs/features/project/deploy_key_clone_spec.rb
@@ -92,7 +92,9 @@ module QA
         Page::Project::Pipeline::Show.act { go_to_first_job }
 
         Page::Project::Job::Show.perform do |job|
-          job.wait(reload: false) { job.completed? }
+          job.wait(reload: false) do
+            job.completed? && !job.trace_loading?
+          end
 
           expect(job.passed?).to be_truthy, "Job status did not become \"passed\"."
           expect(job.output).to include(sha1sum)
diff --git a/qa/qa/specs/features/repository/protected_branches_spec.rb b/qa/qa/specs/features/repository/protected_branches_spec.rb
index 9e438aa3c30..491675875b9 100644
--- a/qa/qa/specs/features/repository/protected_branches_spec.rb
+++ b/qa/qa/specs/features/repository/protected_branches_spec.rb
@@ -7,12 +7,6 @@ module QA
         resource.name = 'protected-branch-project'
       end
     end
-    given(:location) do
-      Page::Project::Show.act do
-        choose_repository_clone_http
-        repository_location
-      end
-    end
 
     before do
       Runtime::Browser.visit(:gitlab, Page::Main::Login)
@@ -26,44 +20,49 @@ module QA
       Capybara.execute_script 'localStorage.clear()'
     end
 
-    scenario 'user is able to protect a branch' do
-      protected_branch = Factory::Resource::Branch.fabricate! do |resource|
-        resource.branch_name = branch_name
-        resource.project = project
-        resource.allow_to_push = true
-        resource.protected = true
+    context 'when developers and maintainers are allowed to push to a protected branch' do
+      let!(:protected_branch) { create_protected_branch(allow_to_push: true) }
+
+      scenario 'user with push rights successfully pushes to the protected branch' do
+        expect(protected_branch.name).to have_content(branch_name)
+        expect(protected_branch.push_allowance).to have_content('Developers + Maintainers')
+
+        push = push_new_file(branch_name)
+
+        expect(push.output).to match(/remote: To create a merge request for protected-branch, visit/)
       end
+    end
+
+    context 'when developers and maintainers are not allowed to push to a protected branch' do
+      scenario 'user without push rights fails to push to the protected branch' do
+        create_protected_branch(allow_to_push: false)
+
+        push = push_new_file(branch_name)
 
-      expect(protected_branch.name).to have_content(branch_name)
-      expect(protected_branch.push_allowance).to have_content('Developers + Maintainers')
+        expect(push.output)
+          .to match(/remote\: GitLab\: You are not allowed to push code to protected branches on this project/)
+        expect(push.output)
+          .to match(/\[remote rejected\] #{branch_name} -> #{branch_name} \(pre-receive hook declined\)/)
+      end
     end
 
-    scenario 'users without authorization cannot push to protected branch' do
+    def create_protected_branch(allow_to_push:)
       Factory::Resource::Branch.fabricate! do |resource|
         resource.branch_name = branch_name
         resource.project = project
-        resource.allow_to_push = false
+        resource.allow_to_push = allow_to_push
         resource.protected = true
       end
+    end
 
-      project.visit!
-
-      Git::Repository.perform do |repository|
-        repository.uri = location.uri
-        repository.use_default_credentials
-
-        repository.act do
-          clone
-          configure_identity('GitLab QA', 'root@gitlab.com')
-          checkout('protected-branch')
-          commit_file('README.md', 'readme content', 'Add a readme')
-          push_changes('protected-branch')
-        end
-
-        expect(repository.push_error)
-          .to match(/remote\: GitLab\: You are not allowed to push code to protected branches on this project/)
-        expect(repository.push_error)
-          .to match(/\[remote rejected\] #{branch_name} -> #{branch_name} \(pre-receive hook declined\)/)
+    def push_new_file(branch)
+      Factory::Repository::Push.fabricate! do |resource|
+        resource.project = project
+        resource.file_name = 'new_file.md'
+        resource.file_content = '# This is a new file'
+        resource.commit_message = 'Add new_file.md'
+        resource.branch_name = branch_name
+        resource.new_branch = false
       end
     end
   end