summaryrefslogtreecommitdiff
path: root/spec/features/admin
diff options
context:
space:
mode:
authorVinnie Okada <vokada@mrvinn.com>2015-01-24 11:02:58 -0700
committerVinnie Okada <vokada@mrvinn.com>2015-02-14 11:09:23 -0700
commit76aad9b76ed756ca9ba2cbcdb399c815e542b3ae (patch)
tree7226e0ce64796abbf4848582baed8d173ddecd14 /spec/features/admin
parent5725b6daad2f403f13112cfcafa5b45ac126c0ca (diff)
downloadgitlab-ce-76aad9b76ed756ca9ba2cbcdb399c815e542b3ae.tar.gz
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.
Diffstat (limited to 'spec/features/admin')
-rw-r--r--spec/features/admin/admin_projects_spec.rb6
-rw-r--r--spec/features/admin/security_spec.rb2
2 files changed, 4 insertions, 4 deletions
diff --git a/spec/features/admin/admin_projects_spec.rb b/spec/features/admin/admin_projects_spec.rb
index eae3d102334..101d955d693 100644
--- a/spec/features/admin/admin_projects_spec.rb
+++ b/spec/features/admin/admin_projects_spec.rb
@@ -8,11 +8,11 @@ describe "Admin::Projects", feature: true do
describe "GET /admin/projects" do
before do
- visit admin_projects_path
+ visit admin_namespaces_projects_path
end
it "should be ok" do
- expect(current_path).to eq(admin_projects_path)
+ expect(current_path).to eq(admin_namespaces_projects_path)
end
it "should have projects list" do
@@ -22,7 +22,7 @@ describe "Admin::Projects", feature: true do
describe "GET /admin/projects/:id" do
before do
- visit admin_projects_path
+ visit admin_namespaces_projects_path
click_link "#{@project.name}"
end
diff --git a/spec/features/admin/security_spec.rb b/spec/features/admin/security_spec.rb
index 2bcd3d8d010..175fa9d4647 100644
--- a/spec/features/admin/security_spec.rb
+++ b/spec/features/admin/security_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
describe "Admin::Projects", feature: true do
describe "GET /admin/projects" do
- subject { admin_projects_path }
+ subject { admin_namespaces_projects_path }
it { is_expected.to be_allowed_for :admin }
it { is_expected.to be_denied_for :user }