Download as
Browse Code »

Commit dd68e37db36de31da256be0f9167469b9918a909

Authored by Dmitriy Zaporozhets
1 parent e50c0d5c
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Fix profile specs

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