diff --git a/spec/requests/security/project_access_spec.rb b/spec/requests/security/project_access_spec.rb
index 9b07df6c..5f26b781 100644
--- a/spec/requests/security/project_access_spec.rb
+++ b/spec/requests/security/project_access_spec.rb
@@ -14,204 +14,218 @@ describe "Application access" do
   end
 
   describe "Project" do
+    let(:project)  { create(:project) }
+
+    let(:master)   { create(:user) }
+    let(:guest)    { create(:user) }
+    let(:reporter) { create(:user) }
+
     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)
+      project.users_projects.create(user: master, project_access: UsersProject::MASTER)
+
       # readonly
-      @project.users_projects.create(user: @u3, project_access: UsersProject::REPORTER)
+      project.users_projects.create(user: reporter, project_access: UsersProject::REPORTER)
     end
 
     describe "GET /project_code" do
-      subject { project_path(@project) }
+      subject { project_path(project) }
 
-      it { should be_allowed_for @u1 }
-      it { should be_allowed_for @u3 }
+      it { should be_allowed_for master }
+      it { should be_allowed_for reporter }
       it { should be_denied_for :admin }
-      it { should be_denied_for @u2 }
+      it { should be_denied_for guest }
       it { should be_denied_for :user }
       it { should be_denied_for :visitor }
     end
 
-    describe "GET /project_code/master/tree" do
-      subject { project_tree_path(@project, @project.root_ref) }
+    describe "GET /project_code/tree/master" do
+      subject { project_tree_path(project, project.root_ref) }
 
-      it { should be_allowed_for @u1 }
-      it { should be_allowed_for @u3 }
+      it { should be_allowed_for master }
+      it { should be_allowed_for reporter }
       it { should be_denied_for :admin }
-      it { should be_denied_for @u2 }
+      it { should be_denied_for guest }
       it { should be_denied_for :user }
       it { should be_denied_for :visitor }
     end
 
-    describe "GET /project_code/commits" do
-      subject { project_commits_path(@project) }
+    describe "GET /project_code/commits/master" do
+      subject { project_commits_path(project, project.root_ref) }
 
-      it { should be_allowed_for @u1 }
-      it { should be_allowed_for @u3 }
+      it { should be_allowed_for master }
+      it { should be_allowed_for reporter }
       it { should be_denied_for :admin }
-      it { should be_denied_for @u2 }
+      it { should be_denied_for guest }
       it { should be_denied_for :user }
       it { should be_denied_for :visitor }
     end
 
-    describe "GET /project_code/commit" do
-      subject { project_commit_path(@project, @project.commit.id) }
+    describe "GET /project_code/commit/:sha" do
+      subject { project_commit_path(project, project.commit) }
 
-      it { should be_allowed_for @u1 }
-      it { should be_allowed_for @u3 }
+      it { should be_allowed_for master }
+      it { should be_allowed_for reporter }
       it { should be_denied_for :admin }
-      it { should be_denied_for @u2 }
+      it { should be_denied_for guest }
+      it { should be_denied_for :user }
+      it { should be_denied_for :visitor }
+    end
+
+    describe "GET /project_code/compare" do
+      subject { project_compare_index_path(project) }
+
+      it { should be_allowed_for master }
+      it { should be_allowed_for reporter }
+      it { should be_denied_for :admin }
+      it { should be_denied_for guest }
       it { should be_denied_for :user }
       it { should be_denied_for :visitor }
     end
 
     describe "GET /project_code/team" do
-      subject { project_team_index_path(@project) }
+      subject { project_team_index_path(project) }
 
-      it { should be_allowed_for @u1 }
-      it { should be_allowed_for @u3 }
+      it { should be_allowed_for master }
+      it { should be_allowed_for reporter }
       it { should be_denied_for :admin }
-      it { should be_denied_for @u2 }
+      it { should be_denied_for guest }
       it { should be_denied_for :user }
       it { should be_denied_for :visitor }
     end
 
     describe "GET /project_code/wall" do
-      subject { wall_project_path(@project) }
+      subject { wall_project_path(project) }
 
-      it { should be_allowed_for @u1 }
-      it { should be_allowed_for @u3 }
+      it { should be_allowed_for master }
+      it { should be_allowed_for reporter }
       it { should be_denied_for :admin }
-      it { should be_denied_for @u2 }
+      it { should be_denied_for guest }
       it { should be_denied_for :user }
       it { should be_denied_for :visitor }
     end
 
     describe "GET /project_code/blob" do
       before do
-        commit = @project.commit
+        commit = project.commit
         path = commit.tree.contents.select { |i| i.is_a?(Grit::Blob)}.first.name
-        @blob_path = project_blob_path(@project, File.join(commit.id, path))
+        @blob_path = project_blob_path(project, File.join(commit.id, path))
       end
 
-      it { @blob_path.should be_allowed_for @u1 }
-      it { @blob_path.should be_allowed_for @u3 }
+      it { @blob_path.should be_allowed_for master }
+      it { @blob_path.should be_allowed_for reporter }
       it { @blob_path.should be_denied_for :admin }
-      it { @blob_path.should be_denied_for @u2 }
+      it { @blob_path.should be_denied_for guest }
       it { @blob_path.should be_denied_for :user }
       it { @blob_path.should be_denied_for :visitor }
     end
 
     describe "GET /project_code/edit" do
-      subject { edit_project_path(@project) }
+      subject { edit_project_path(project) }
 
-      it { should be_allowed_for @u1 }
-      it { should be_denied_for @u3 }
+      it { should be_allowed_for master }
+      it { should be_denied_for reporter }
       it { should be_denied_for :admin }
-      it { should be_denied_for @u2 }
+      it { should be_denied_for guest }
       it { should be_denied_for :user }
       it { should be_denied_for :visitor }
     end
 
     describe "GET /project_code/deploy_keys" do
-      subject { project_deploy_keys_path(@project) }
+      subject { project_deploy_keys_path(project) }
 
-      it { should be_allowed_for @u1 }
-      it { should be_denied_for @u3 }
+      it { should be_allowed_for master }
+      it { should be_denied_for reporter }
       it { should be_denied_for :admin }
-      it { should be_denied_for @u2 }
+      it { should be_denied_for guest }
       it { should be_denied_for :user }
       it { should be_denied_for :visitor }
     end
 
     describe "GET /project_code/issues" do
-      subject { project_issues_path(@project) }
+      subject { project_issues_path(project) }
 
-      it { should be_allowed_for @u1 }
-      it { should be_allowed_for @u3 }
+      it { should be_allowed_for master }
+      it { should be_allowed_for reporter }
       it { should be_denied_for :admin }
-      it { should be_denied_for @u2 }
+      it { should be_denied_for guest }
       it { should be_denied_for :user }
       it { should be_denied_for :visitor }
     end
 
     describe "GET /project_code/snippets" do
-      subject { project_snippets_path(@project) }
+      subject { project_snippets_path(project) }
 
-      it { should be_allowed_for @u1 }
-      it { should be_allowed_for @u3 }
+      it { should be_allowed_for master }
+      it { should be_allowed_for reporter }
       it { should be_denied_for :admin }
-      it { should be_denied_for @u2 }
+      it { should be_denied_for guest }
       it { should be_denied_for :user }
       it { should be_denied_for :visitor }
     end
 
     describe "GET /project_code/merge_requests" do
-      subject { project_merge_requests_path(@project) }
+      subject { project_merge_requests_path(project) }
 
-      it { should be_allowed_for @u1 }
-      it { should be_allowed_for @u3 }
+      it { should be_allowed_for master }
+      it { should be_allowed_for reporter }
       it { should be_denied_for :admin }
-      it { should be_denied_for @u2 }
+      it { should be_denied_for guest }
       it { should be_denied_for :user }
       it { should be_denied_for :visitor }
     end
 
     describe "GET /project_code/repository" do
-      subject { project_repository_path(@project) }
+      subject { project_repository_path(project) }
 
-      it { should be_allowed_for @u1 }
-      it { should be_allowed_for @u3 }
+      it { should be_allowed_for master }
+      it { should be_allowed_for reporter }
       it { should be_denied_for :admin }
-      it { should be_denied_for @u2 }
+      it { should be_denied_for guest }
       it { should be_denied_for :user }
       it { should be_denied_for :visitor }
     end
 
     describe "GET /project_code/repository/branches" do
-      subject { branches_project_repository_path(@project) }
+      subject { branches_project_repository_path(project) }
 
-      it { should be_allowed_for @u1 }
-      it { should be_allowed_for @u3 }
+      it { should be_allowed_for master }
+      it { should be_allowed_for reporter }
       it { should be_denied_for :admin }
-      it { should be_denied_for @u2 }
+      it { should be_denied_for guest }
       it { should be_denied_for :user }
       it { should be_denied_for :visitor }
     end
 
     describe "GET /project_code/repository/tags" do
-      subject { tags_project_repository_path(@project) }
+      subject { tags_project_repository_path(project) }
 
-      it { should be_allowed_for @u1 }
-      it { should be_allowed_for @u3 }
+      it { should be_allowed_for master }
+      it { should be_allowed_for reporter }
       it { should be_denied_for :admin }
-      it { should be_denied_for @u2 }
+      it { should be_denied_for guest }
       it { should be_denied_for :user }
       it { should be_denied_for :visitor }
     end
 
     describe "GET /project_code/hooks" do
-      subject { project_hooks_path(@project) }
+      subject { project_hooks_path(project) }
 
-      it { should be_allowed_for @u1 }
-      it { should be_allowed_for @u3 }
+      it { should be_allowed_for master }
+      it { should be_allowed_for reporter }
       it { should be_denied_for :admin }
-      it { should be_denied_for @u2 }
+      it { should be_denied_for guest }
       it { should be_denied_for :user }
       it { should be_denied_for :visitor }
     end
 
     describe "GET /project_code/files" do
-      subject { files_project_path(@project) }
+      subject { files_project_path(project) }
 
-      it { should be_allowed_for @u1 }
-      it { should be_allowed_for @u3 }
+      it { should be_allowed_for master }
+      it { should be_allowed_for reporter }
       it { should be_denied_for :admin }
-      it { should be_denied_for @u2 }
+      it { should be_denied_for guest }
       it { should be_denied_for :user }
       it { should be_denied_for :visitor }
     end