Comments cucumber. More refactoring. Cucumber -> branches, tags

Dmitriy Zaporozhets · randx
1 parent 1281c122
Showing 18 changed files with 301 additions and 413 deletions Show diff stats
features/projects/commits/branches.feature
features/projects/commits/commit_comments.feature
features/projects/commits/tags.feature
features/projects/issues/issues.feature
features/projects/project.feature
features/projects/wiki.feature
features/step_definitions/project/project_commits_steps.rb
features/step_definitions/project/project_issues_steps.rb
features/step_definitions/project/projects_steps.rb
spec/monkeypatch.rb
spec/requests/access_spec.rb
spec/requests/commits_notes_spec.rb
spec/requests/repositories_spec.rb
spec/requests/security/profile_access_spec.rb
spec/requests/security/project_access_spec.rb
spec/requests/team_members_spec.rb
spec/requests/user_security_spec.rb
spec/requests/wikis_notes_spec.rb
@@ -2,9 +2,19 @@ Feature: Browse branches
   Background: 
     Given I signin as a user
     And I own project "Shop"
+    And project "Shop" has protected branches
     Given I visit project branches page
-  Scenario: I can see all git branches
+  Scenario: I can see project recent git branches
+    Then I should see "Shop" recent branches list
+
+  Scenario: I can see project all git branches
+    Given I click link "All"
+    Then I should see "Shop" all branches list
+
+  Scenario: I can see project protected git branches
+    Given I click link "Protected"
+    Then I should see "Shop" protected branches list
   Scenario: I can download project by branch
@@ -4,4 +4,7 @@ Feature: Comment commit
     And I own project "Shop"
     Given I visit project commit page
-  Scenario: I leave a comment for commit
+  @javascript
+  Scenario: I comment commit
+    Given I leave a comment like "XML attached"
+    Then I should see comment "XML attached"
@@ -5,7 +5,6 @@ Feature: Browse tags
     Given I visit project tags page
   Scenario: I can see all git tags
+    Then I should see "Shop" all tags list
   Scenario: I can download project by tag
-
-
@@ -35,4 +35,4 @@ Feature: Issues
   Scenario: I comment issue
     Given I visit issue page "Release 0.4"
     And I leave a comment like "XML attached"
-    Then I should see commetn "XML attached"
+    Then I should see comment "XML attached"
@@ -0,0 +1,11 @@
+Feature: Project
+  Background:
+    Given I signin as a user
+    And I own project "Shop"
+    And I visit project "Shop" page 
+
+  Scenario: I should see project activity
+
+  Scenario: I edit project
+
+  Scenario: I visit attachments
@@ -7,3 +7,9 @@ Feature: Wiki
   Scenario: Add new page
     Given I create Wiki page
     Then I should see newly created wiki page
+
+  @javascript
+  Scenario: I comment wiki page
+    Given I create Wiki page
+    And I leave a comment like "XML attached"
+    Then I should see comment "XML attached"
@@ -59,3 +59,30 @@ end
 Given /^I visit project tags page$/ do
   visit tags_project_repository_path(@project)
 end
+
+Then /^I should see "(.*?)" recent branches list$/ do |arg1|
+  page.should have_content("Branches")
+  page.should have_content("master")
+end
+
+Then /^I should see "(.*?)" all branches list$/ do |arg1|
+  page.should have_content("Branches")
+  page.should have_content("master")
+end
+
+Then /^I should see "(.*?)" all tags list$/ do |arg1|
+  page.should have_content("Tags")
+  page.should have_content("v1.2.1")
+end
+
+Then /^I should see "(.*?)" protected branches list$/ do |arg1|
+  within "table" do 
+    page.should have_content "stable"
+    page.should_not have_content "master"
+  end
+end
+
+Given /^project "(.*?)" has protected branches$/ do |arg1|
+  project = Project.find_by_name(arg1)
+  project.protected_branches.create(:name => "stable")
+end
@@ -32,15 +32,6 @@ Given /^I visit issue page &quot;(.*?)&quot;$/ do |arg1|
   visit project_issue_path(issue.project, issue)
 end
-Given /^I leave a comment like "(.*?)"$/ do |arg1|
-  fill_in "note_note", :with => arg1
-  click_button "Add Comment"
-end
-
-Then /^I should see commetn "(.*?)"$/ do |arg1|
-  page.should have_content(arg1)
-end
-
 Given /^I submit new issue "(.*?)"$/ do |arg1|
   fill_in "issue_title", :with => arg1
   click_button "Submit new issue"
@@ -50,6 +50,11 @@ Given /^I write new comment &quot;(.*?)&quot;$/ do |arg1|
   click_button "Add Comment"
 end
+Given /^I visit project "(.*?)" page$/ do |arg1|
+  project = Project.find_by_name(arg1)
+  visit project_path(project)
+end
+
 Given /^I visit project "(.*?)" network page$/ do |arg1|
   project = Project.find_by_name(arg1)
   visit graph_project_path(project)
@@ -66,3 +71,12 @@ Given /^page should have network graph$/ do
     page.should have_content "notes_refacto..."
   end
 end
+
+Given /^I leave a comment like "(.*?)"$/ do |arg1|
+  fill_in "note_note", :with => arg1
+  click_button "Add Comment"
+end
+
+Then /^I should see comment "(.*?)"$/ do |arg1|
+  page.should have_content(arg1)
+end
@@ -44,4 +44,8 @@ class FakeSatellite
   end
 end
-
+class ProtectedBranch
+  def update_repository
+    true
+  end
+end
@@ -1,187 +0,0 @@
-require 'spec_helper'
-
-describe "Application access" do
-  describe "GET /" do
-    it { root_path.should be_allowed_for :admin }
-    it { root_path.should be_allowed_for :user }
-    it { root_path.should be_denied_for :visitor }
-  end
-
-  describe "GET /projects/new" do
-    it { new_project_path.should be_allowed_for :admin }
-    it { new_project_path.should be_allowed_for :user }
-    it { new_project_path.should be_denied_for :visitor }
-  end
-
-  describe "Project" do
-    before do
-      @project = Factory :project
-      @u1 = Factory :user
-      @u2 = Factory :user
-      @u3 = Factory :user
-      # full access
-      @project.users_projects.create(:user => @u1, :project_access => UsersProject::MASTER)
-      # readonly
-      @project.users_projects.create(:user => @u3, :project_access => UsersProject::REPORTER)
-    end
-
-    describe "GET /project_code" do
-      it { project_path(@project).should be_allowed_for @u1 }
-      it { project_path(@project).should be_allowed_for @u3 }
-      it { project_path(@project).should be_denied_for :admin }
-      it { project_path(@project).should be_denied_for @u2 }
-      it { project_path(@project).should be_denied_for :user }
-      it { project_path(@project).should be_denied_for :visitor }
-    end
-
-    describe "GET /project_code/master/tree" do
-      it { tree_project_ref_path(@project, @project.root_ref).should be_allowed_for @u1 }
-      it { tree_project_ref_path(@project, @project.root_ref).should be_allowed_for @u3 }
-      it { tree_project_ref_path(@project, @project.root_ref).should be_denied_for :admin }
-      it { tree_project_ref_path(@project, @project.root_ref).should be_denied_for @u2 }
-      it { tree_project_ref_path(@project, @project.root_ref).should be_denied_for :user }
-      it { tree_project_ref_path(@project, @project.root_ref).should be_denied_for :visitor }
-    end
-
-    describe "GET /project_code/commits" do
-      it { project_commits_path(@project).should be_allowed_for @u1 }
-      it { project_commits_path(@project).should be_allowed_for @u3 }
-      it { project_commits_path(@project).should be_denied_for :admin }
-      it { project_commits_path(@project).should be_denied_for @u2 }
-      it { project_commits_path(@project).should be_denied_for :user }
-      it { project_commits_path(@project).should be_denied_for :visitor }
-    end
-
-    describe "GET /project_code/commit" do
-      it { project_commit_path(@project, @project.commit.id).should be_allowed_for @u1 }
-      it { project_commit_path(@project, @project.commit.id).should be_allowed_for @u3 }
-      it { project_commit_path(@project, @project.commit.id).should be_denied_for :admin }
-      it { project_commit_path(@project, @project.commit.id).should be_denied_for @u2 }
-      it { project_commit_path(@project, @project.commit.id).should be_denied_for :user }
-      it { project_commit_path(@project, @project.commit.id).should be_denied_for :visitor }
-    end
-
-    describe "GET /project_code/team" do
-      it { team_project_path(@project).should be_allowed_for @u1 }
-      it { team_project_path(@project).should be_allowed_for @u3 }
-      it { team_project_path(@project).should be_denied_for :admin }
-      it { team_project_path(@project).should be_denied_for @u2 }
-      it { team_project_path(@project).should be_denied_for :user }
-      it { team_project_path(@project).should be_denied_for :visitor }
-    end
-
-    describe "GET /project_code/wall" do
-      it { wall_project_path(@project).should be_allowed_for @u1 }
-      it { wall_project_path(@project).should be_allowed_for @u3 }
-      it { wall_project_path(@project).should be_denied_for :admin }
-      it { wall_project_path(@project).should be_denied_for @u2 }
-      it { wall_project_path(@project).should be_denied_for :user }
-      it { wall_project_path(@project).should be_denied_for :visitor }
-    end
-
-    describe "GET /project_code/blob" do
-      before do
-        @commit = @project.commit
-        @path = @commit.tree.contents.select { |i| i.is_a?(Grit::Blob)}.first.name
-        @blob_path = blob_project_ref_path(@project, @commit.id, :path => @path)
-      end
-
-      it { @blob_path.should be_allowed_for @u1 }
-      it { @blob_path.should be_allowed_for @u3 }
-      it { @blob_path.should be_denied_for :admin }
-      it { @blob_path.should be_denied_for @u2 }
-      it { @blob_path.should be_denied_for :user }
-      it { @blob_path.should be_denied_for :visitor }
-    end
-
-    describe "GET /project_code/edit" do
-      it { edit_project_path(@project).should be_allowed_for @u1 }
-      it { edit_project_path(@project).should be_denied_for @u3 }
-      it { edit_project_path(@project).should be_denied_for :admin }
-      it { edit_project_path(@project).should be_denied_for @u2 }
-      it { edit_project_path(@project).should be_denied_for :user }
-      it { edit_project_path(@project).should be_denied_for :visitor }
-    end
-
-    describe "GET /project_code/deploy_keys" do
-      it { project_deploy_keys_path(@project).should be_allowed_for @u1 }
-      it { project_deploy_keys_path(@project).should be_denied_for @u3 }
-      it { project_deploy_keys_path(@project).should be_denied_for :admin }
-      it { project_deploy_keys_path(@project).should be_denied_for @u2 }
-      it { project_deploy_keys_path(@project).should be_denied_for :user }
-      it { project_deploy_keys_path(@project).should be_denied_for :visitor }
-    end
-
-    describe "GET /project_code/issues" do
-      it { project_issues_path(@project).should be_allowed_for @u1 }
-      it { project_issues_path(@project).should be_allowed_for @u3 }
-      it { project_issues_path(@project).should be_denied_for :admin }
-      it { project_issues_path(@project).should be_denied_for @u2 }
-      it { project_issues_path(@project).should be_denied_for :user }
-      it { project_issues_path(@project).should be_denied_for :visitor }
-    end
-
-    describe "GET /project_code/snippets" do
-      it { project_snippets_path(@project).should be_allowed_for @u1 }
-      it { project_snippets_path(@project).should be_allowed_for @u3 }
-      it { project_snippets_path(@project).should be_denied_for :admin }
-      it { project_snippets_path(@project).should be_denied_for @u2 }
-      it { project_snippets_path(@project).should be_denied_for :user }
-      it { project_snippets_path(@project).should be_denied_for :visitor }
-    end
-
-    describe "GET /project_code/merge_requests" do
-      it { project_merge_requests_path(@project).should be_allowed_for @u1 }
-      it { project_merge_requests_path(@project).should be_allowed_for @u3 }
-      it { project_merge_requests_path(@project).should be_denied_for :admin }
-      it { project_merge_requests_path(@project).should be_denied_for @u2 }
-      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
@@ -1,28 +0,0 @@
-require 'spec_helper'
-
-describe "Issues" do
-  let(:project) { Factory :project }
-  let!(:commit) { project.repo.commits.first }
-
-  before do
-    login_as :user
-    project.add_access(@user, :read, :write)
-  end
-
-  describe "add new note", :js => true do
-    before do
-      visit project_commit_path(project, commit)
-      fill_in "note_note", :with => "I commented this commit"
-      click_button "Add Comment"
-    end
-
-    it "should conatin new note" do
-      page.should have_content("I commented this commit")
-    end
-
-    it "should be displayed when i visit this commit again" do 
-      visit project_commit_path(project, commit)
-      page.should have_content("I commented this commit")
-    end
-  end
-end
@@ -1,49 +0,0 @@
-require 'spec_helper'
-
-describe "Repository" do
-
-  before do
-    @user = Factory :user
-    @project = Factory :project
-    @project.add_access(@user, :read, :write)
-    login_with @user
-  end
-
-  describe "GET /:project_name/repository" do
-    before do
-      visit project_repository_path(@project)
-    end
-
-    it "should be on projects page" do
-      current_path.should == project_repository_path(@project)
-    end
-
-    it "should have link to last commit for activities tab" do
-      page.should have_content(@project.commit.safe_message[0..20])
-    end
-  end
-
-  describe "GET /:project_name/repository/branches" do
-    before do
-      visit branches_project_repository_path(@project)
-    end
-
-    it "should have link to repo activities" do
-      page.should have_content("Branches")
-      page.should have_content("master")
-    end
-  end
-
-  # TODO: Add new repo to seeds with tags list
-  describe "GET /:project_name/repository/tags" do
-    before do
-      visit tags_project_repository_path(@project)
-    end
-
-    it "should have link to repo activities" do
-      page.should have_content("Tags")
-      page.should have_content("v1.2.1")
-    end
-  end
-end
-
@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+describe "Users Security" do
+  describe "Project" do
+    before do
+      @u1 = Factory :user
+    end
+
+    describe "GET /login" do
+      it { new_user_session_path.should_not be_404_for :visitor }
+    end
+
+    describe "GET /keys" do
+      it { keys_path.should be_allowed_for @u1 }
+      it { keys_path.should be_allowed_for :admin }
+      it { keys_path.should be_allowed_for :user }
+      it { keys_path.should be_denied_for :visitor }
+    end
+
+    describe "GET /profile" do
+      it { profile_path.should be_allowed_for @u1 }
+      it { profile_path.should be_allowed_for :admin }
+      it { profile_path.should be_allowed_for :user }
+      it { profile_path.should be_denied_for :visitor }
+    end
+
+    describe "GET /profile/password" do
+      it { profile_password_path.should be_allowed_for @u1 }
+      it { profile_password_path.should be_allowed_for :admin }
+      it { profile_password_path.should be_allowed_for :user }
+      it { profile_password_path.should be_denied_for :visitor }
+    end
+  end
+end
@@ -0,0 +1,187 @@
+require 'spec_helper'
+
+describe "Application access" do
+  describe "GET /" do
+    it { root_path.should be_allowed_for :admin }
+    it { root_path.should be_allowed_for :user }
+    it { root_path.should be_denied_for :visitor }
+  end
+
+  describe "GET /projects/new" do
+    it { new_project_path.should be_allowed_for :admin }
+    it { new_project_path.should be_allowed_for :user }
+    it { new_project_path.should be_denied_for :visitor }
+  end
+
+  describe "Project" do
+    before do
+      @project = Factory :project
+      @u1 = Factory :user
+      @u2 = Factory :user
+      @u3 = Factory :user
+      # full access
+      @project.users_projects.create(:user => @u1, :project_access => UsersProject::MASTER)
+      # readonly
+      @project.users_projects.create(:user => @u3, :project_access => UsersProject::REPORTER)
+    end
+
+    describe "GET /project_code" do
+      it { project_path(@project).should be_allowed_for @u1 }
+      it { project_path(@project).should be_allowed_for @u3 }
+      it { project_path(@project).should be_denied_for :admin }
+      it { project_path(@project).should be_denied_for @u2 }
+      it { project_path(@project).should be_denied_for :user }
+      it { project_path(@project).should be_denied_for :visitor }
+    end
+
+    describe "GET /project_code/master/tree" do
+      it { tree_project_ref_path(@project, @project.root_ref).should be_allowed_for @u1 }
+      it { tree_project_ref_path(@project, @project.root_ref).should be_allowed_for @u3 }
+      it { tree_project_ref_path(@project, @project.root_ref).should be_denied_for :admin }
+      it { tree_project_ref_path(@project, @project.root_ref).should be_denied_for @u2 }
+      it { tree_project_ref_path(@project, @project.root_ref).should be_denied_for :user }
+      it { tree_project_ref_path(@project, @project.root_ref).should be_denied_for :visitor }
+    end
+
+    describe "GET /project_code/commits" do
+      it { project_commits_path(@project).should be_allowed_for @u1 }
+      it { project_commits_path(@project).should be_allowed_for @u3 }
+      it { project_commits_path(@project).should be_denied_for :admin }
+      it { project_commits_path(@project).should be_denied_for @u2 }
+      it { project_commits_path(@project).should be_denied_for :user }
+      it { project_commits_path(@project).should be_denied_for :visitor }
+    end
+
+    describe "GET /project_code/commit" do
+      it { project_commit_path(@project, @project.commit.id).should be_allowed_for @u1 }
+      it { project_commit_path(@project, @project.commit.id).should be_allowed_for @u3 }
+      it { project_commit_path(@project, @project.commit.id).should be_denied_for :admin }
+      it { project_commit_path(@project, @project.commit.id).should be_denied_for @u2 }
+      it { project_commit_path(@project, @project.commit.id).should be_denied_for :user }
+      it { project_commit_path(@project, @project.commit.id).should be_denied_for :visitor }
+    end
+
+    describe "GET /project_code/team" do
+      it { team_project_path(@project).should be_allowed_for @u1 }
+      it { team_project_path(@project).should be_allowed_for @u3 }
+      it { team_project_path(@project).should be_denied_for :admin }
+      it { team_project_path(@project).should be_denied_for @u2 }
+      it { team_project_path(@project).should be_denied_for :user }
+      it { team_project_path(@project).should be_denied_for :visitor }
+    end
+
+    describe "GET /project_code/wall" do
+      it { wall_project_path(@project).should be_allowed_for @u1 }
+      it { wall_project_path(@project).should be_allowed_for @u3 }
+      it { wall_project_path(@project).should be_denied_for :admin }
+      it { wall_project_path(@project).should be_denied_for @u2 }
+      it { wall_project_path(@project).should be_denied_for :user }
+      it { wall_project_path(@project).should be_denied_for :visitor }
+    end
+
+    describe "GET /project_code/blob" do
+      before do
+        @commit = @project.commit
+        @path = @commit.tree.contents.select { |i| i.is_a?(Grit::Blob)}.first.name
+        @blob_path = blob_project_ref_path(@project, @commit.id, :path => @path)
+      end
+
+      it { @blob_path.should be_allowed_for @u1 }
+      it { @blob_path.should be_allowed_for @u3 }
+      it { @blob_path.should be_denied_for :admin }
+      it { @blob_path.should be_denied_for @u2 }
+      it { @blob_path.should be_denied_for :user }
+      it { @blob_path.should be_denied_for :visitor }
+    end
+
+    describe "GET /project_code/edit" do
+      it { edit_project_path(@project).should be_allowed_for @u1 }
+      it { edit_project_path(@project).should be_denied_for @u3 }
+      it { edit_project_path(@project).should be_denied_for :admin }
+      it { edit_project_path(@project).should be_denied_for @u2 }
+      it { edit_project_path(@project).should be_denied_for :user }
+      it { edit_project_path(@project).should be_denied_for :visitor }
+    end
+
+    describe "GET /project_code/deploy_keys" do
+      it { project_deploy_keys_path(@project).should be_allowed_for @u1 }
+      it { project_deploy_keys_path(@project).should be_denied_for @u3 }
+      it { project_deploy_keys_path(@project).should be_denied_for :admin }
+      it { project_deploy_keys_path(@project).should be_denied_for @u2 }
+      it { project_deploy_keys_path(@project).should be_denied_for :user }
+      it { project_deploy_keys_path(@project).should be_denied_for :visitor }
+    end
+
+    describe "GET /project_code/issues" do
+      it { project_issues_path(@project).should be_allowed_for @u1 }
+      it { project_issues_path(@project).should be_allowed_for @u3 }
+      it { project_issues_path(@project).should be_denied_for :admin }
+      it { project_issues_path(@project).should be_denied_for @u2 }
+      it { project_issues_path(@project).should be_denied_for :user }
+      it { project_issues_path(@project).should be_denied_for :visitor }
+    end
+
+    describe "GET /project_code/snippets" do
+      it { project_snippets_path(@project).should be_allowed_for @u1 }
+      it { project_snippets_path(@project).should be_allowed_for @u3 }
+      it { project_snippets_path(@project).should be_denied_for :admin }
+      it { project_snippets_path(@project).should be_denied_for @u2 }
+      it { project_snippets_path(@project).should be_denied_for :user }
+      it { project_snippets_path(@project).should be_denied_for :visitor }
+    end
+
+    describe "GET /project_code/merge_requests" do
+      it { project_merge_requests_path(@project).should be_allowed_for @u1 }
+      it { project_merge_requests_path(@project).should be_allowed_for @u3 }
+      it { project_merge_requests_path(@project).should be_denied_for :admin }
+      it { project_merge_requests_path(@project).should be_denied_for @u2 }
+      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
@@ -1,68 +0,0 @@
-require 'spec_helper'
-
-describe "TeamMembers" do
-  before do
-    login_as :user
-    @project = Factory :project
-    @project.add_access(@user, :read, :admin)
-  end
-
-  describe "Update profile", :js => true do
-    it "should update user role" do
-      @project.master_access_for?(@user).should be_true
-      visit team_project_path(@project)
-      select "Developer", :from => "team_member_project_access"
-      @project.master_access_for?(@user).should be_false
-      @project.dev_access_for?(@user).should be_true
-    end
-  end
-
-  describe "View profile" do
-    it "should be available" do
-      visit(team_project_path(@project))
-      click_link(@user.name)
-      page.should have_content @user.skype
-      page.should_not have_content 'Twitter'
-    end
-  end
-
-  describe "New Team member" do
-    before do
-      @user_1 = Factory :user
-      visit team_project_path(@project)
-      click_link "New Team Member"
-    end
-
-    it "should open new team member popup" do
-      page.should have_content("New Team member")
-    end
-
-    describe "fill in" do
-      before do
-        within "#new_team_member" do 
-          select @user_1.name, :from => "team_member_user_id"
-          select "Reporter", :from => "team_member_project_access"
-        end
-      end
-
-      it { expect { click_button "Save";sleep(1) }.to change {UsersProject.count}.by(1) }
-
-      it "should add new member to table" do
-        click_button "Save"
-        @member = UsersProject.last
-
-        page.should have_content @user_1.name
-
-        @member.reload
-        @member.project_access.should == UsersProject::REPORTER
-      end
-    end
-  end
-
-  describe "Cancel membership" do
-    it "should cancel membership" do
-      visit project_team_member_path(@project, @project.users_projects.last)
-      expect { click_link "Remove from team" }.to change { UsersProject.count }.by(-1)
-    end
-  end
-end
@@ -1,37 +0,0 @@
-require 'spec_helper'
-
-describe "Users Security" do
-  describe "Project" do
-    before do
-      @u1 = Factory :user
-    end
-
-    describe "GET /login" do
-      #it { new_user_session_path.should be_denied_for @u1 }
-      #it { new_user_session_path.should be_denied_for :admin }
-      #it { new_user_session_path.should be_denied_for :user }
-      it { new_user_session_path.should_not be_404_for :visitor }
-    end
-
-    describe "GET /keys" do
-      it { keys_path.should be_allowed_for @u1 }
-      it { keys_path.should be_allowed_for :admin }
-      it { keys_path.should be_allowed_for :user }
-      it { keys_path.should be_denied_for :visitor }
-    end
-
-    describe "GET /profile" do
-      it { profile_path.should be_allowed_for @u1 }
-      it { profile_path.should be_allowed_for :admin }
-      it { profile_path.should be_allowed_for :user }
-      it { profile_path.should be_denied_for :visitor }
-    end
-
-    describe "GET /profile/password" do
-      it { profile_password_path.should be_allowed_for @u1 }
-      it { profile_password_path.should be_allowed_for :admin }
-      it { profile_password_path.should be_allowed_for :user }
-      it { profile_password_path.should be_denied_for :visitor }
-    end
-  end
-end
@@ -1,29 +0,0 @@
-require 'spec_helper'
-
-describe "Wikis" do
-  let(:project) { Factory :project }
-
-  before do
-    login_as :user
-    project.add_access(@user, :read, :write)
-  end
-
-  describe "add new note", :js => true do
-    before do
-      visit project_wiki_path(project, :index)
-      
-      fill_in "Title", :with => 'Test title'
-      fill_in "Content", :with => '[link test](test)'
-      click_on "Save"
-      
-      page.should have_content("Test title")
-      
-      fill_in "note_note", :with => "Comment on wiki!"
-      click_button "Add Comment"
-    end
-
-    it "should contain the new note" do
-      page.should have_content("Comment on wiki!")
-    end
-  end
-end
	@@ -2,9 +2,19 @@ Feature: Browse branches		@@ -2,9 +2,19 @@ Feature: Browse branches
2	Background:	2	Background:
3	Given I signin as a user	3	Given I signin as a user
4	And I own project "Shop"	4	And I own project "Shop"
		5	+ And project "Shop" has protected branches
5	Given I visit project branches page	6	Given I visit project branches page
6		7
7	- Scenario: I can see all git branches	8	+ Scenario: I can see project recent git branches
		9	+ Then I should see "Shop" recent branches list
		10	+
		11	+ Scenario: I can see project all git branches
		12	+ Given I click link "All"
		13	+ Then I should see "Shop" all branches list
		14	+
		15	+ Scenario: I can see project protected git branches
		16	+ Given I click link "Protected"
		17	+ Then I should see "Shop" protected branches list
8		18
9	Scenario: I can download project by branch	19	Scenario: I can download project by branch
10		20
	@@ -4,4 +4,7 @@ Feature: Comment commit		@@ -4,4 +4,7 @@ Feature: Comment commit
4	And I own project "Shop"	4	And I own project "Shop"
5	Given I visit project commit page	5	Given I visit project commit page
6		6
7	- Scenario: I leave a comment for commit	7	+ @javascript
		8	+ Scenario: I comment commit
		9	+ Given I leave a comment like "XML attached"
		10	+ Then I should see comment "XML attached"
	@@ -5,7 +5,6 @@ Feature: Browse tags		@@ -5,7 +5,6 @@ Feature: Browse tags
5	Given I visit project tags page	5	Given I visit project tags page
6		6
7	Scenario: I can see all git tags	7	Scenario: I can see all git tags
		8	+ Then I should see "Shop" all tags list
8		9
9	Scenario: I can download project by tag	10	Scenario: I can download project by tag
10	-
11	-
	@@ -35,4 +35,4 @@ Feature: Issues		@@ -35,4 +35,4 @@ Feature: Issues
35	Scenario: I comment issue	35	Scenario: I comment issue
36	Given I visit issue page "Release 0.4"	36	Given I visit issue page "Release 0.4"
37	And I leave a comment like "XML attached"	37	And I leave a comment like "XML attached"
38	- Then I should see commetn "XML attached"	38	+ Then I should see comment "XML attached"
@@ -0,0 +1,11 @@		@@ -0,0 +1,11 @@
	1	+Feature: Project
	2	+ Background:
	3	+ Given I signin as a user
	4	+ And I own project "Shop"
	5	+ And I visit project "Shop" page
	6	+
	7	+ Scenario: I should see project activity
	8	+
	9	+ Scenario: I edit project
	10	+
	11	+ Scenario: I visit attachments
	@@ -7,3 +7,9 @@ Feature: Wiki		@@ -7,3 +7,9 @@ Feature: Wiki
7	Scenario: Add new page	7	Scenario: Add new page
8	Given I create Wiki page	8	Given I create Wiki page
9	Then I should see newly created wiki page	9	Then I should see newly created wiki page
		10	+
		11	+ @javascript
		12	+ Scenario: I comment wiki page
		13	+ Given I create Wiki page
		14	+ And I leave a comment like "XML attached"
		15	+ Then I should see comment "XML attached"
	@@ -59,3 +59,30 @@ end		@@ -59,3 +59,30 @@ end
59	Given /^I visit project tags page$/ do	59	Given /^I visit project tags page$/ do
60	visit tags_project_repository_path(@project)	60	visit tags_project_repository_path(@project)
61	end	61	end
		62	+
		63	+Then /^I should see "(.*?)" recent branches list$/ do \|arg1\|
		64	+ page.should have_content("Branches")
		65	+ page.should have_content("master")
		66	+end
		67	+
		68	+Then /^I should see "(.*?)" all branches list$/ do \|arg1\|
		69	+ page.should have_content("Branches")
		70	+ page.should have_content("master")
		71	+end
		72	+
		73	+Then /^I should see "(.*?)" all tags list$/ do \|arg1\|
		74	+ page.should have_content("Tags")
		75	+ page.should have_content("v1.2.1")
		76	+end
		77	+
		78	+Then /^I should see "(.*?)" protected branches list$/ do \|arg1\|
		79	+ within "table" do
		80	+ page.should have_content "stable"
		81	+ page.should_not have_content "master"
		82	+ end
		83	+end
		84	+
		85	+Given /^project "(.*?)" has protected branches$/ do \|arg1\|
		86	+ project = Project.find_by_name(arg1)
		87	+ project.protected_branches.create(:name => "stable")
		88	+end
	@@ -32,15 +32,6 @@ Given /^I visit issue page "(.*?)"$/ do \|arg1\|		@@ -32,15 +32,6 @@ Given /^I visit issue page "(.*?)"$/ do \|arg1\|
32	visit project_issue_path(issue.project, issue)	32	visit project_issue_path(issue.project, issue)
33	end	33	end
34		34
35	-Given /^I leave a comment like "(.*?)"$/ do \|arg1\|
36	- fill_in "note_note", :with => arg1
37	- click_button "Add Comment"
38	-end
39	-
40	-Then /^I should see commetn "(.*?)"$/ do \|arg1\|
41	- page.should have_content(arg1)
42	-end
43	-
44	Given /^I submit new issue "(.*?)"$/ do \|arg1\|	35	Given /^I submit new issue "(.*?)"$/ do \|arg1\|
45	fill_in "issue_title", :with => arg1	36	fill_in "issue_title", :with => arg1
46	click_button "Submit new issue"	37	click_button "Submit new issue"
	@@ -50,6 +50,11 @@ Given /^I write new comment "(.*?)"$/ do \|arg1\|		@@ -50,6 +50,11 @@ Given /^I write new comment "(.*?)"$/ do \|arg1\|
50	click_button "Add Comment"	50	click_button "Add Comment"
51	end	51	end
52		52
		53	+Given /^I visit project "(.*?)" page$/ do \|arg1\|
		54	+ project = Project.find_by_name(arg1)
		55	+ visit project_path(project)
		56	+end
		57	+
53	Given /^I visit project "(.*?)" network page$/ do \|arg1\|	58	Given /^I visit project "(.*?)" network page$/ do \|arg1\|
54	project = Project.find_by_name(arg1)	59	project = Project.find_by_name(arg1)
55	visit graph_project_path(project)	60	visit graph_project_path(project)
	@@ -66,3 +71,12 @@ Given /^page should have network graph$/ do		@@ -66,3 +71,12 @@ Given /^page should have network graph$/ do
66	page.should have_content "notes_refacto..."	71	page.should have_content "notes_refacto..."
67	end	72	end
68	end	73	end
		74	+
		75	+Given /^I leave a comment like "(.*?)"$/ do \|arg1\|
		76	+ fill_in "note_note", :with => arg1
		77	+ click_button "Add Comment"
		78	+end
		79	+
		80	+Then /^I should see comment "(.*?)"$/ do \|arg1\|
		81	+ page.should have_content(arg1)
		82	+end
	@@ -44,4 +44,8 @@ class FakeSatellite		@@ -44,4 +44,8 @@ class FakeSatellite
44	end	44	end
45	end	45	end
46		46
47	-	47	+class ProtectedBranch
		48	+ def update_repository
		49	+ true
		50	+ end
		51	+end