Upgrade to Rails 4.1.9

Make the following changes to deal with new behavior in Rails 4.1.2:

* Use nested resources to avoid slashes in arguments to path helpers.

1 files changed, 15 insertions, 15 deletions

diff --git a/spec/features/security/project/private_access_spec.rb b/spec/features/security/project/private_access_spec.rb
index fd21e722611..ea146c3f0e4 100644
--- a/spec/features/security/project/private_access_spec.rb
+++ b/spec/features/security/project/private_access_spec.rb
@@ -25,7 +25,7 @@ describe "Private Project Access", feature: true  do
   end
 
   describe "GET /:project_path" do
-    subject { project_path(project) }
+    subject { namespace_project_path(project.namespace, project) }
 
     it { is_expected.to be_allowed_for master }
     it { is_expected.to be_allowed_for reporter }
@@ -36,7 +36,7 @@ describe "Private Project Access", feature: true  do
   end
 
   describe "GET /:project_path/tree/master" do
-    subject { project_tree_path(project, project.repository.root_ref) }
+    subject { namespace_project_tree_path(project.namespace, project, project.repository.root_ref) }
 
     it { is_expected.to be_allowed_for master }
     it { is_expected.to be_allowed_for reporter }
@@ -47,7 +47,7 @@ describe "Private Project Access", feature: true  do
   end
 
   describe "GET /:project_path/commits/master" do
-    subject { project_commits_path(project, project.repository.root_ref, limit: 1) }
+    subject { namespace_project_commits_path(project.namespace, project, project.repository.root_ref, limit: 1) }
 
     it { is_expected.to be_allowed_for master }
     it { is_expected.to be_allowed_for reporter }
@@ -58,7 +58,7 @@ describe "Private Project Access", feature: true  do
   end
 
   describe "GET /:project_path/commit/:sha" do
-    subject { project_commit_path(project, project.repository.commit) }
+    subject { namespace_project_commit_path(project.namespace, project, project.repository.commit) }
 
     it { is_expected.to be_allowed_for master }
     it { is_expected.to be_allowed_for reporter }
@@ -69,7 +69,7 @@ describe "Private Project Access", feature: true  do
   end
 
   describe "GET /:project_path/compare" do
-    subject { project_compare_index_path(project) }
+    subject { namespace_project_compare_index_path(project.namespace, project) }
 
     it { is_expected.to be_allowed_for master }
     it { is_expected.to be_allowed_for reporter }
@@ -80,7 +80,7 @@ describe "Private Project Access", feature: true  do
   end
 
   describe "GET /:project_path/team" do
-    subject { project_team_index_path(project) }
+    subject { namespace_project_team_index_path(project.namespace, project) }
 
     it { is_expected.to be_allowed_for master }
     it { is_expected.to be_denied_for reporter }
@@ -94,7 +94,7 @@ describe "Private Project Access", feature: true  do
     before do
       commit = project.repository.commit
       path = '.gitignore'
-      @blob_path = project_blob_path(project, File.join(commit.id, path))
+      @blob_path = namespace_project_blob_path(project.namespace, project, File.join(commit.id, path))
     end
 
     it { expect(@blob_path).to be_allowed_for master }
@@ -106,7 +106,7 @@ describe "Private Project Access", feature: true  do
   end
 
   describe "GET /:project_path/edit" do
-    subject { edit_project_path(project) }
+    subject { edit_namespace_project_path(project.namespace, project) }
 
     it { is_expected.to be_allowed_for master }
     it { is_expected.to be_denied_for reporter }
@@ -117,7 +117,7 @@ describe "Private Project Access", feature: true  do
   end
 
   describe "GET /:project_path/deploy_keys" do
-    subject { project_deploy_keys_path(project) }
+    subject { namespace_project_deploy_keys_path(project.namespace, project) }
 
     it { is_expected.to be_allowed_for master }
     it { is_expected.to be_denied_for reporter }
@@ -128,7 +128,7 @@ describe "Private Project Access", feature: true  do
   end
 
   describe "GET /:project_path/issues" do
-    subject { project_issues_path(project) }
+    subject { namespace_project_issues_path(project.namespace, project) }
 
     it { is_expected.to be_allowed_for master }
     it { is_expected.to be_allowed_for reporter }
@@ -139,7 +139,7 @@ describe "Private Project Access", feature: true  do
   end
 
   describe "GET /:project_path/snippets" do
-    subject { project_snippets_path(project) }
+    subject { namespace_project_snippets_path(project.namespace, project) }
 
     it { is_expected.to be_allowed_for master }
     it { is_expected.to be_allowed_for reporter }
@@ -150,7 +150,7 @@ describe "Private Project Access", feature: true  do
   end
 
   describe "GET /:project_path/merge_requests" do
-    subject { project_merge_requests_path(project) }
+    subject { namespace_project_merge_requests_path(project.namespace, project) }
 
     it { is_expected.to be_allowed_for master }
     it { is_expected.to be_allowed_for reporter }
@@ -161,7 +161,7 @@ describe "Private Project Access", feature: true  do
   end
 
   describe "GET /:project_path/branches" do
-    subject { project_branches_path(project) }
+    subject { namespace_project_branches_path(project.namespace, project) }
 
     before do
       # Speed increase
@@ -177,7 +177,7 @@ describe "Private Project Access", feature: true  do
   end
 
   describe "GET /:project_path/tags" do
-    subject { project_tags_path(project) }
+    subject { namespace_project_tags_path(project.namespace, project) }
 
     before do
       # Speed increase
@@ -193,7 +193,7 @@ describe "Private Project Access", feature: true  do
   end
 
   describe "GET /:project_path/hooks" do
-    subject { project_hooks_path(project) }
+    subject { namespace_project_hooks_path(project.namespace, project) }
 
     it { is_expected.to be_allowed_for master }
     it { is_expected.to be_denied_for reporter }