Merge branch 'master' into extend_markdown_upload

# Conflicts:
#	app/views/projects/issues/_form.html.haml
#	app/views/projects/merge_requests/_form.html.haml
#	app/views/projects/merge_requests/_new_submit.html.haml
#	app/views/projects/milestones/_form.html.haml
#	app/views/projects/notes/_form.html.haml
#	app/views/projects/wikis/_form.html.haml
#	config/routes.rb
#	spec/controllers/projects_controller_spec.rb

1 files changed, 14 insertions, 8 deletions

diff --git a/spec/controllers/projects_controller_spec.rb b/spec/controllers/projects_controller_spec.rb
index 9be4c2e505c..89bb35de8fc 100644
--- a/spec/controllers/projects_controller_spec.rb
+++ b/spec/controllers/projects_controller_spec.rb
@@ -4,21 +4,27 @@ describe ProjectsController do
   let(:project) { create(:project) }
   let(:public_project) { create(:project, :public) }
   let(:user)    { create(:user) }
-  
-  describe 'POST #toggle_star' do
-    it 'toggles star if user is signed in' do
+  let(:jpg)     { fixture_file_upload(Rails.root + 'spec/fixtures/rails_sample.jpg', 'image/jpg') }
+  let(:txt)     { fixture_file_upload(Rails.root + 'spec/fixtures/doc_sample.txt', 'text/plain') }
+
+  describe "POST #toggle_star" do
+    it "toggles star if user is signed in" do
       sign_in(user)
       expect(user.starred?(public_project)).to be_falsey
-      post :toggle_star, id: public_project.to_param
+      post(:toggle_star, namespace_id: public_project.namespace.to_param,
+           id: public_project.to_param)
       expect(user.starred?(public_project)).to be_truthy
-      post :toggle_star, id: public_project.to_param
+      post(:toggle_star, namespace_id: public_project.namespace.to_param,
+           id: public_project.to_param)
       expect(user.starred?(public_project)).to be_falsey
     end
 
-    it 'does nothing if user is not signed in' do
-      post :toggle_star, id: public_project.to_param
+    it "does nothing if user is not signed in" do
+      post(:toggle_star, namespace_id: project.namespace.to_param,
+           id: public_project.to_param)
       expect(user.starred?(public_project)).to be_falsey
-      post :toggle_star, id: public_project.to_param
+      post(:toggle_star, namespace_id: project.namespace.to_param,
+           id: public_project.to_param)
       expect(user.starred?(public_project)).to be_falsey
     end
   end