summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authormo khan <mo@mokhan.ca>2014-05-21 22:43:19 -0600
committermo khan <mo@mokhan.ca>2014-05-21 22:43:19 -0600
commite49bef1d3606217baeba3efbaa44ce5f11f2c93e (patch)
tree15719e332e48c188b683eedd658067c000b616c9 /spec
parent0e1f35bf3f1a023e3f71b916ec5927ab46800249 (diff)
move avatars to my/avatars.
Diffstat (limited to 'spec')
-rw-r--r--spec/controllers/my/avatars_controller_spec.rb (renamed from spec/controllers/avatars_controller_spec.rb)4
-rw-r--r--spec/features/upload_avatar_spec.rb2
2 files changed, 3 insertions, 3 deletions
diff --git a/spec/controllers/avatars_controller_spec.rb b/spec/controllers/my/avatars_controller_spec.rb
index 0a38ddb7..66ded19f 100644
--- a/spec/controllers/avatars_controller_spec.rb
+++ b/spec/controllers/my/avatars_controller_spec.rb
@@ -1,6 +1,6 @@
require "spec_helper"
-describe AvatarsController do
+describe My::AvatarsController do
let(:user) { create(:user) }
context "when logged in " do
@@ -18,7 +18,7 @@ describe AvatarsController do
end
it "should redirect to the avatar page" do
- response.should redirect_to edit_avatar_path(user)
+ response.should redirect_to edit_my_avatar_path(user)
end
it "should display a flash notice" do
diff --git a/spec/features/upload_avatar_spec.rb b/spec/features/upload_avatar_spec.rb
index af6e5f84..fb2cf2d8 100644
--- a/spec/features/upload_avatar_spec.rb
+++ b/spec/features/upload_avatar_spec.rb
@@ -10,7 +10,7 @@ describe "uploading an avatar" do
fill_in('user_password', :with => "password")
end
click_button("Sign In")
- visit edit_avatar_path(user)
+ visit edit_my_avatar_path(user)
file = File.expand_path(File.join(Rails.root, '/spec/fixtures/images/gorilla.jpg'))
within(".edit_avatar") do
attach_file('avatar_avatar', file)