Commit dd68e37d authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Fix profile specs

parent e50c0d5c
...@@ -12,7 +12,7 @@ describe "Profile account page" do ...@@ -12,7 +12,7 @@ describe "Profile account page" do
describe "when signup is enabled" do describe "when signup is enabled" do
before do before do
Gitlab.config.gitlab.stub(:signup_enabled).and_return(true) Gitlab.config.gitlab.stub(:signup_enabled).and_return(true)
visit account_profile_path visit profile_account_path
end end
it { page.should have_content("Remove account") } it { page.should have_content("Remove account") }
...@@ -26,12 +26,12 @@ describe "Profile account page" do ...@@ -26,12 +26,12 @@ describe "Profile account page" do
describe "when signup is disabled" do describe "when signup is disabled" do
before do before do
Gitlab.config.gitlab.stub(:signup_enabled).and_return(false) Gitlab.config.gitlab.stub(:signup_enabled).and_return(false)
visit account_profile_path visit profile_account_path
end end
it "should not have option to remove account" do it "should not have option to remove account" do
page.should_not have_content("Remove account") page.should_not have_content("Remove account")
current_path.should == account_profile_path current_path.should == profile_account_path
end end
end end
end end
...@@ -29,7 +29,7 @@ describe "Users Security" do ...@@ -29,7 +29,7 @@ describe "Users Security" do
end end
describe "GET /profile/account" do describe "GET /profile/account" do
subject { account_profile_path } subject { profile_account_path }
it { should be_allowed_for @u1 } it { should be_allowed_for @u1 }
it { should be_allowed_for :admin } it { should be_allowed_for :admin }
......
...@@ -128,7 +128,7 @@ end ...@@ -128,7 +128,7 @@ end
# profile_update PUT /profile/update(.:format) profile#update # profile_update PUT /profile/update(.:format) profile#update
describe ProfilesController, "routing" do describe ProfilesController, "routing" do
it "to #account" do it "to #account" do
get("/profile/account").should route_to('profiles#account') get("/profile/account").should route_to('profiles/accounts#show')
end end
it "to #history" do it "to #history" do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment