spec/demo/spec/spec_utils.rb in kojac-0.13.0 vs spec/demo/spec/spec_utils.rb in kojac-0.15.0

@@ -3,39 +3,39 @@
 
 def stub_login_user(aValues=nil)
 	aValues ||= {}
 	aValues[:ring] ||= USER_RING
 	user = FactoryGirl.create(:user,aValues)
-	ApplicationController.any_instance.stub(:current_user).and_return(user)
+	KojacFrontController.any_instance.stub(:current_user).and_return(user)
 	user
 end
 
-def do_op(read_op)
+def exec_op(read_op)
 	content = {
 		options: {},
 		ops: [
 			read_op
 		]
 	}
 	request.accept = "application/json"
 	post :receive, format: :json, kojac: content
 	result = nil
-	error = nil
+	err = nil
 	output = JSON.parse response.body
 	if output['error']
 		response.status.should >= 400
 		output.g?('error.errors').should be_a Array
 		output.g?('error.kind').should be
 		output['error']['errors'].length.should >= 1
-		error = output['error']
+		err = output['error']
 	else
 		response.status.should == 200
 		output['ops'].should be_a Array
 		output['ops'].length.should >= 1
 		op = output['ops'].first
 		result = op['results'][op['result_key']]
 	end
-	[result,error]
+	[result,err]
 end
 
 # from http://openhood.com/rails/rails%203/2010/07/20/add-routes-at-runtime-rails-3/
 def draw_routes(&block)
 	begin