Commit dd68e37db36de31da256be0f9167469b9918a909
1 parent
e50c0d5c
Exists in
master
and in
4 other branches
Fix profile specs
Showing
3 changed files
with
5 additions
and
5 deletions
Show diff stats
spec/features/profile_spec.rb
| @@ -12,7 +12,7 @@ describe "Profile account page" do | @@ -12,7 +12,7 @@ describe "Profile account page" do | ||
| 12 | describe "when signup is enabled" do | 12 | describe "when signup is enabled" do |
| 13 | before do | 13 | before do |
| 14 | Gitlab.config.gitlab.stub(:signup_enabled).and_return(true) | 14 | Gitlab.config.gitlab.stub(:signup_enabled).and_return(true) |
| 15 | - visit account_profile_path | 15 | + visit profile_account_path |
| 16 | end | 16 | end |
| 17 | 17 | ||
| 18 | it { page.should have_content("Remove account") } | 18 | 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 | ||
| 26 | describe "when signup is disabled" do | 26 | describe "when signup is disabled" do |
| 27 | before do | 27 | before do |
| 28 | Gitlab.config.gitlab.stub(:signup_enabled).and_return(false) | 28 | Gitlab.config.gitlab.stub(:signup_enabled).and_return(false) |
| 29 | - visit account_profile_path | 29 | + visit profile_account_path |
| 30 | end | 30 | end |
| 31 | 31 | ||
| 32 | it "should not have option to remove account" do | 32 | it "should not have option to remove account" do |
| 33 | page.should_not have_content("Remove account") | 33 | page.should_not have_content("Remove account") |
| 34 | - current_path.should == account_profile_path | 34 | + current_path.should == profile_account_path |
| 35 | end | 35 | end |
| 36 | end | 36 | end |
| 37 | end | 37 | end |
spec/features/security/profile_access_spec.rb
| @@ -29,7 +29,7 @@ describe "Users Security" do | @@ -29,7 +29,7 @@ describe "Users Security" do | ||
| 29 | end | 29 | end |
| 30 | 30 | ||
| 31 | describe "GET /profile/account" do | 31 | describe "GET /profile/account" do |
| 32 | - subject { account_profile_path } | 32 | + subject { profile_account_path } |
| 33 | 33 | ||
| 34 | it { should be_allowed_for @u1 } | 34 | it { should be_allowed_for @u1 } |
| 35 | it { should be_allowed_for :admin } | 35 | it { should be_allowed_for :admin } |
spec/routing/routing_spec.rb
| @@ -128,7 +128,7 @@ end | @@ -128,7 +128,7 @@ end | ||
| 128 | # profile_update PUT /profile/update(.:format) profile#update | 128 | # profile_update PUT /profile/update(.:format) profile#update |
| 129 | describe ProfilesController, "routing" do | 129 | describe ProfilesController, "routing" do |
| 130 | it "to #account" do | 130 | it "to #account" do |
| 131 | - get("/profile/account").should route_to('profiles#account') | 131 | + get("/profile/account").should route_to('profiles/accounts#show') |
| 132 | end | 132 | end |
| 133 | 133 | ||
| 134 | it "to #history" do | 134 | it "to #history" do |