Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimothy Andrew <mail@timothyandrew.net>2016-07-14 06:54:59 +0300
committerTimothy Andrew <mail@timothyandrew.net>2016-07-29 12:50:39 +0300
commit4d6dadc8f8af986a0792fb388775a174e76b0b7d (patch)
tree77e30b543c2b3c65cd8d8d7047795196072db877 /spec/features/protected_branches_spec.rb
parentf2df2966aabc601dd1d6a6f9e75ead84db8a2765 (diff)
Make specs compatible with PhantomJS versions < 2.
1. These versions of PhantomJS don't support `PATCH` requests, so we use a `POST` with `_method` set to `PATCH`.
Diffstat (limited to 'spec/features/protected_branches_spec.rb')
-rw-r--r--spec/features/protected_branches_spec.rb4
1 files changed, 0 insertions, 4 deletions
diff --git a/spec/features/protected_branches_spec.rb b/spec/features/protected_branches_spec.rb
index 553d1c70461..d72b62a4962 100644
--- a/spec/features/protected_branches_spec.rb
+++ b/spec/features/protected_branches_spec.rb
@@ -97,8 +97,6 @@ feature 'Projected Branches', feature: true, js: true do
expect(ProtectedBranch.last.allowed_to_push).to eq(access_type_id)
end
- # This spec fails on PhantomJS versions below 2.0, which don't support `PATCH` requests.
- # https://github.com/ariya/phantomjs/issues/11384
it "allows updating protected branches so that #{access_type_name} can push to them" do
visit namespace_project_protected_branches_path(project.namespace, project)
set_protected_branch_name('master')
@@ -130,8 +128,6 @@ feature 'Projected Branches', feature: true, js: true do
expect(ProtectedBranch.last.allowed_to_merge).to eq(access_type_id)
end
- # This spec fails on PhantomJS versions below 2.0, which don't support `PATCH` requests.
- # https://github.com/ariya/phantomjs/issues/11384
it "allows updating protected branches so that #{access_type_name} can merge to them" do
visit namespace_project_protected_branches_path(project.namespace, project)
set_protected_branch_name('master')