summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com>2012-01-19 09:27:23 +0200
committerDmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com>2012-01-19 09:27:23 +0200
commit00d7bfda95087297ea4205946092185d77d1a872 (patch)
tree79691cd84d8600e8528c6c13f8807025b3dfc033
parent15c46555274a14f3a90f0c8139e59cf1e96eccfc (diff)
downloadgitlab-ce-00d7bfda95087297ea4205946092185d77d1a872.tar.gz
projects link added. security specs added
-rw-r--r--app/assets/images/Storage-UI.PNGbin0 -> 737 bytes
-rw-r--r--app/views/deploy_keys/index.html.haml6
-rw-r--r--app/views/layouts/_head_panel.html.haml4
-rw-r--r--spec/requests/projects_deploy_keys_spec.rb2
-rw-r--r--spec/requests/projects_security_spec.rb45
-rw-r--r--spec/requests/tags_spec.rb27
-rw-r--r--spec/requests/team_members_spec.rb2
7 files changed, 55 insertions, 31 deletions
diff --git a/app/assets/images/Storage-UI.PNG b/app/assets/images/Storage-UI.PNG
new file mode 100644
index 00000000000..8ab6678de32
--- /dev/null
+++ b/app/assets/images/Storage-UI.PNG
Binary files differ
diff --git a/app/views/deploy_keys/index.html.haml b/app/views/deploy_keys/index.html.haml
index d3feadb8742..015b818c76b 100644
--- a/app/views/deploy_keys/index.html.haml
+++ b/app/views/deploy_keys/index.html.haml
@@ -5,6 +5,12 @@
- @keys.each do |key|
= render(:partial => 'show', :locals => {:key => key})
+- if @keys.blank?
+ .notice_holder
+ %li Deploy Keys do not exist yet.
+ - if can? current_user, :admin_project, @project
+ %li You can add a new one by clicking on plus icon
+
:javascript
$('.delete-key').live('ajax:success', function() {
$(this).closest('.update-item').fadeOut(); });
diff --git a/app/views/layouts/_head_panel.html.haml b/app/views/layouts/_head_panel.html.haml
index 101b411072f..f65f20ea722 100644
--- a/app/views/layouts/_head_panel.html.haml
+++ b/app/views/layouts/_head_panel.html.haml
@@ -5,8 +5,8 @@
%div.main_links
= link_to root_path, :class => "home", :title => "Home" do
= image_tag "Home-UI.PNG"
- = link_to :back, :title => "Back" do
- = image_tag "Arrow-Left-UI.PNG"
+ = link_to projects_path, :title => "Projects" do
+ = image_tag "Storage-UI.PNG"
- if project_layout
.project_name
diff --git a/spec/requests/projects_deploy_keys_spec.rb b/spec/requests/projects_deploy_keys_spec.rb
index 629c28871a4..580e55229e1 100644
--- a/spec/requests/projects_deploy_keys_spec.rb
+++ b/spec/requests/projects_deploy_keys_spec.rb
@@ -29,7 +29,7 @@ describe "Projects", "DeployKeys" do
end
end
- describe "New key", :js => true do
+ describe "New key" do
before do
visit project_deploy_keys_path(project)
click_link "New Deploy Key"
diff --git a/spec/requests/projects_security_spec.rb b/spec/requests/projects_security_spec.rb
index fb9f3d8cc60..f8942978a46 100644
--- a/spec/requests/projects_security_spec.rb
+++ b/spec/requests/projects_security_spec.rb
@@ -140,5 +140,50 @@ describe "Projects" do
it { project_merge_requests_path(@project).should be_denied_for :user }
it { project_merge_requests_path(@project).should be_denied_for :visitor }
end
+
+ describe "GET /project_code/repository" do
+ it { project_repository_path(@project).should be_allowed_for @u1 }
+ it { project_repository_path(@project).should be_allowed_for @u3 }
+ it { project_repository_path(@project).should be_denied_for :admin }
+ it { project_repository_path(@project).should be_denied_for @u2 }
+ it { project_repository_path(@project).should be_denied_for :user }
+ it { project_repository_path(@project).should be_denied_for :visitor }
+ end
+
+ describe "GET /project_code/repository/branches" do
+ it { branches_project_repository_path(@project).should be_allowed_for @u1 }
+ it { branches_project_repository_path(@project).should be_allowed_for @u3 }
+ it { branches_project_repository_path(@project).should be_denied_for :admin }
+ it { branches_project_repository_path(@project).should be_denied_for @u2 }
+ it { branches_project_repository_path(@project).should be_denied_for :user }
+ it { branches_project_repository_path(@project).should be_denied_for :visitor }
+ end
+
+ describe "GET /project_code/repository/tags" do
+ it { tags_project_repository_path(@project).should be_allowed_for @u1 }
+ it { tags_project_repository_path(@project).should be_allowed_for @u3 }
+ it { tags_project_repository_path(@project).should be_denied_for :admin }
+ it { tags_project_repository_path(@project).should be_denied_for @u2 }
+ it { tags_project_repository_path(@project).should be_denied_for :user }
+ it { tags_project_repository_path(@project).should be_denied_for :visitor }
+ end
+
+ describe "GET /project_code/hooks" do
+ it { project_hooks_path(@project).should be_allowed_for @u1 }
+ it { project_hooks_path(@project).should be_allowed_for @u3 }
+ it { project_hooks_path(@project).should be_denied_for :admin }
+ it { project_hooks_path(@project).should be_denied_for @u2 }
+ it { project_hooks_path(@project).should be_denied_for :user }
+ it { project_hooks_path(@project).should be_denied_for :visitor }
+ end
+
+ describe "GET /project_code/files" do
+ it { files_project_path(@project).should be_allowed_for @u1 }
+ it { files_project_path(@project).should be_allowed_for @u3 }
+ it { files_project_path(@project).should be_denied_for :admin }
+ it { files_project_path(@project).should be_denied_for @u2 }
+ it { files_project_path(@project).should be_denied_for :user }
+ it { files_project_path(@project).should be_denied_for :visitor }
+ end
end
end
diff --git a/spec/requests/tags_spec.rb b/spec/requests/tags_spec.rb
deleted file mode 100644
index ff72ab1f890..00000000000
--- a/spec/requests/tags_spec.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-require 'spec_helper'
-
-describe "Tags" do
- before { login_as :user }
-
- # describe "GET 'tags/index'" do
- # it "should be successful" do
- # get 'tags/index'
- # response.should be_success
- # end
- # end
-
- describe "GET '/tags.json'" do
- before do
- @project = Factory :project
- @project.add_access(@user, :read)
- @project.tag_list = 'demo1'
- @project.save
- visit '/tags.json'
- end
-
- it "should contains tags" do
- page.should have_content('demo1')
- end
-end
-
-end
diff --git a/spec/requests/team_members_spec.rb b/spec/requests/team_members_spec.rb
index d949d759cf9..b44f47784c8 100644
--- a/spec/requests/team_members_spec.rb
+++ b/spec/requests/team_members_spec.rb
@@ -18,7 +18,7 @@ describe "TeamMembers" do
end
end
- describe "New Team member", :js => true do
+ describe "New Team member" do
before do
@user_1 = Factory :user
visit team_project_path(@project)