summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-05-24 14:10:36 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-05-24 14:10:36 +0300
commit1bb9aeb565fca50304881e36488b202455bdddd2 (patch)
tree6183996de1d4eacecfb930be127644e4eb4d11b7 /spec
parent7c6a58a756cc3bff78a6d0a0ca8abfe9b2c147da (diff)
downloadgitlab-ce-1bb9aeb565fca50304881e36488b202455bdddd2.tar.gz
Fix specs. Fix note form reset after submit
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'spec')
-rw-r--r--spec/features/notes_on_merge_requests_spec.rb2
-rw-r--r--spec/features/security/project/internal_access_spec.rb11
-rw-r--r--spec/features/security/project/private_access_spec.rb11
-rw-r--r--spec/features/security/project/public_access_spec.rb11
4 files changed, 1 insertions, 34 deletions
diff --git a/spec/features/notes_on_merge_requests_spec.rb b/spec/features/notes_on_merge_requests_spec.rb
index 45aebf128c2..7f1da3cffdf 100644
--- a/spec/features/notes_on_merge_requests_spec.rb
+++ b/spec/features/notes_on_merge_requests_spec.rb
@@ -44,7 +44,7 @@ describe "On a merge request", js: true, feature: true do
it 'should have text and visible edit button' do
within(".js-main-target-form") { should have_css(".js-note-preview", text: "This is awesome", visible: true) }
within(".js-main-target-form") { should have_css(".js-note-preview-button", visible: false) }
- within(".js-main-target-form") { should have_css(".js-note-edit-button", visible: true) }
+ within(".js-main-target-form") { should have_css(".js-note-write-button", visible: true) }
end
end
end
diff --git a/spec/features/security/project/internal_access_spec.rb b/spec/features/security/project/internal_access_spec.rb
index f6ab47ed91b..eb8422df599 100644
--- a/spec/features/security/project/internal_access_spec.rb
+++ b/spec/features/security/project/internal_access_spec.rb
@@ -190,17 +190,6 @@ describe "Internal Project Access", feature: true do
it { should be_denied_for :visitor }
end
- describe "GET /:project_path/branches/recent" do
- subject { recent_project_branches_path(project) }
-
- it { should be_allowed_for master }
- it { should be_allowed_for reporter }
- it { should be_allowed_for :admin }
- it { should be_allowed_for guest }
- it { should be_allowed_for :user }
- it { should be_denied_for :visitor }
- end
-
describe "GET /:project_path/branches" do
subject { project_branches_path(project) }
diff --git a/spec/features/security/project/private_access_spec.rb b/spec/features/security/project/private_access_spec.rb
index 8a0fcb8e9ff..186ad350469 100644
--- a/spec/features/security/project/private_access_spec.rb
+++ b/spec/features/security/project/private_access_spec.rb
@@ -168,17 +168,6 @@ describe "Private Project Access", feature: true do
it { should be_denied_for :visitor }
end
- describe "GET /:project_path/branches/recent" do
- subject { recent_project_branches_path(project) }
-
- it { should be_allowed_for master }
- it { should be_allowed_for reporter }
- it { should be_allowed_for :admin }
- it { should be_denied_for guest }
- it { should be_denied_for :user }
- it { should be_denied_for :visitor }
- end
-
describe "GET /:project_path/branches" do
subject { project_branches_path(project) }
diff --git a/spec/features/security/project/public_access_spec.rb b/spec/features/security/project/public_access_spec.rb
index eb511bfefe0..f5d1cf7b971 100644
--- a/spec/features/security/project/public_access_spec.rb
+++ b/spec/features/security/project/public_access_spec.rb
@@ -195,17 +195,6 @@ describe "Public Project Access", feature: true do
it { should be_denied_for :visitor }
end
- describe "GET /:project_path/branches/recent" do
- subject { recent_project_branches_path(project) }
-
- it { should be_allowed_for master }
- it { should be_allowed_for reporter }
- it { should be_allowed_for :admin }
- it { should be_allowed_for guest }
- it { should be_allowed_for :user }
- it { should be_allowed_for :visitor }
- end
-
describe "GET /:project_path/branches" do
subject { project_branches_path(project) }