mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-05-14 11:15:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

removed unwanted methods from orders

Browse Source
This commit is contained in:
Skud
2013-05-15 14:20:31 +10:00
parent a047f60af3
commit 8a35f3401b
10 changed files with 20 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
app/controllers/orders_controller.rb
View File

@@ -32,53 +32,4 @@ class OrdersController < ApplicationController
format.json { render json: @order }
end
end
# GET /orders/1/edit
def edit
@order = Order.find(params[:id])
end
# POST /orders
# POST /orders.json
def create
@order = Order.new(params[:order])
respond_to do |format|
if @order.save
format.html { redirect_to @order, notice: 'Order was successfully created.' }
format.json { render json: @order, status: :created, location: @order }
else
format.html { render action: "new" }
format.json { render json: @order.errors, status: :unprocessable_entity }
end
end
end
# PUT /orders/1
# PUT /orders/1.json
def update
@order = Order.find(params[:id])
respond_to do |format|
if @order.update_attributes(params[:order])
format.html { redirect_to @order, notice: 'Order was successfully updated.' }
format.json { head :no_content }
else
format.html { render action: "edit" }
format.json { render json: @order.errors, status: :unprocessable_entity }
end
end
end
# DELETE /orders/1
# DELETE /orders/1.json
def destroy
@order = Order.find(params[:id])
@order.destroy
respond_to do |format|
format.html { redirect_to orders_url }
format.json { head :no_content }
end
end
end

1
app/models/ability.rb
View File

@@ -30,6 +30,7 @@ class Ability
# admins can manage products and orders
can :manage, Product
can :manage, Order # for now
can :manage, OrderItem # for now
end
# managing your own user settings

13
app/views/orders/_form.html.haml
View File

@@ -1,13 +0,0 @@
= form_for @order do |f|
- if @order.errors.any?
#error_explanation
%h2= "#{pluralize(@order.errors.count, "error")} prohibited this order from being saved:"
%ul
- @order.errors.full_messages.each do |msg|
%li= msg
.field
= f.label :member_id
= f.text_field :member_id
.actions
= f.submit 'Save'

7
app/views/orders/edit.html.haml
View File

@@ -1,7 +0,0 @@
%h1 Editing order
= render 'form'
= link_to 'Show', @order
\|
= link_to 'Back', orders_path

5
app/views/orders/new.html.haml
View File

@@ -1,5 +0,0 @@
%h1 New order
= render 'form'
= link_to 'Back', orders_path

64
spec/controllers/order_items_controller_spec.rb
View File

@@ -1,43 +1,17 @@
require 'spec_helper'
# This spec was generated by rspec-rails when you ran the scaffold generator.
# It demonstrates how one might use RSpec to specify the controller code that
# was generated by Rails when you ran the scaffold generator.
#
# It assumes that the implementation code is generated by the rails scaffold
# generator. If you are using any extension libraries to generate different
# controller code, this generated spec may or may not pass.
#
# It only uses APIs available in rails and/or rspec-rails. There are a number
# of tools you can use to make these specs even more expressive, but we're
# sticking to rails and rspec-rails APIs to keep things simple and stable.
#
# Compared to earlier versions of this generator, there is very limited use of
# stubs and message expectations in this spec. Stubs are only used when there
# is no simpler way to get a handle on the object needed for the example.
# Message expectations are only used when there is no simpler way to specify
# that an instance is receiving a specific message.
describe OrderItemsController do
# This should return the minimal set of attributes required to create a valid
# OrderItem. As you add validations to OrderItem, be sure to
# update the return value of this method accordingly.
def valid_attributes
{ "order_id" => "1" }
end
login_member(:admin_member)
# This should return the minimal set of values that should be in the session
# in order to pass any filters (e.g. authentication) defined in
# OrderItemsController. Be sure to keep this updated too.
def valid_session
{}
def valid_attributes
{ "order_id" => "1", "product_id" => "1" }
end
describe "GET index" do
it "assigns all order_items as @order_items" do
order_item = OrderItem.create! valid_attributes
get :index, {}, valid_session
get :index, {}
assigns(:order_items).should eq([order_item])
end
end
@@ -45,14 +19,14 @@ describe OrderItemsController do
describe "GET show" do
it "assigns the requested order_item as @order_item" do
order_item = OrderItem.create! valid_attributes
get :show, {:id => order_item.to_param}, valid_session
get :show, {:id => order_item.to_param}
assigns(:order_item).should eq(order_item)
end
end
describe "GET new" do
it "assigns a new order_item as @order_item" do
get :new, {}, valid_session
get :new, {}
assigns(:order_item).should be_a_new(OrderItem)
end
end
@@ -60,7 +34,7 @@ describe OrderItemsController do
describe "GET edit" do
it "assigns the requested order_item as @order_item" do
order_item = OrderItem.create! valid_attributes
get :edit, {:id => order_item.to_param}, valid_session
get :edit, {:id => order_item.to_param}
assigns(:order_item).should eq(order_item)
end
end
@@ -69,18 +43,18 @@ describe OrderItemsController do
describe "with valid params" do
it "creates a new OrderItem" do
expect {
post :create, {:order_item => valid_attributes}, valid_session
post :create, {:order_item => valid_attributes}
}.to change(OrderItem, :count).by(1)
end
it "assigns a newly created order_item as @order_item" do
post :create, {:order_item => valid_attributes}, valid_session
post :create, {:order_item => valid_attributes}
assigns(:order_item).should be_a(OrderItem)
assigns(:order_item).should be_persisted
end
it "redirects to the created order_item" do
post :create, {:order_item => valid_attributes}, valid_session
post :create, {:order_item => valid_attributes}
response.should redirect_to(OrderItem.last)
end
end
@@ -89,14 +63,14 @@ describe OrderItemsController do
it "assigns a newly created but unsaved order_item as @order_item" do
# Trigger the behavior that occurs when invalid params are submitted
OrderItem.any_instance.stub(:save).and_return(false)
post :create, {:order_item => { "order_id" => "invalid value" }}, valid_session
post :create, {:order_item => { "order_id" => "invalid value" }}
assigns(:order_item).should be_a_new(OrderItem)
end
it "re-renders the 'new' template" do
# Trigger the behavior that occurs when invalid params are submitted
OrderItem.any_instance.stub(:save).and_return(false)
post :create, {:order_item => { "order_id" => "invalid value" }}, valid_session
post :create, {:order_item => { "order_id" => "invalid value" }}
response.should render_template("new")
end
end
@@ -111,18 +85,18 @@ describe OrderItemsController do
# receives the :update_attributes message with whatever params are
# submitted in the request.
OrderItem.any_instance.should_receive(:update_attributes).with({ "order_id" => "1" })
put :update, {:id => order_item.to_param, :order_item => { "order_id" => "1" }}, valid_session
put :update, {:id => order_item.to_param, :order_item => { "order_id" => "1" }}
end
it "assigns the requested order_item as @order_item" do
order_item = OrderItem.create! valid_attributes
put :update, {:id => order_item.to_param, :order_item => valid_attributes}, valid_session
put :update, {:id => order_item.to_param, :order_item => valid_attributes}
assigns(:order_item).should eq(order_item)
end
it "redirects to the order_item" do
order_item = OrderItem.create! valid_attributes
put :update, {:id => order_item.to_param, :order_item => valid_attributes}, valid_session
put :update, {:id => order_item.to_param, :order_item => valid_attributes}
response.should redirect_to(order_item)
end
end
@@ -132,7 +106,7 @@ describe OrderItemsController do
order_item = OrderItem.create! valid_attributes
# Trigger the behavior that occurs when invalid params are submitted
OrderItem.any_instance.stub(:save).and_return(false)
put :update, {:id => order_item.to_param, :order_item => { "order_id" => "invalid value" }}, valid_session
put :update, {:id => order_item.to_param, :order_item => { "order_id" => "invalid value" }}
assigns(:order_item).should eq(order_item)
end
@@ -140,7 +114,7 @@ describe OrderItemsController do
order_item = OrderItem.create! valid_attributes
# Trigger the behavior that occurs when invalid params are submitted
OrderItem.any_instance.stub(:save).and_return(false)
put :update, {:id => order_item.to_param, :order_item => { "order_id" => "invalid value" }}, valid_session
put :update, {:id => order_item.to_param, :order_item => { "order_id" => "invalid value" }}
response.should render_template("edit")
end
end
@@ -150,13 +124,13 @@ describe OrderItemsController do
it "destroys the requested order_item" do
order_item = OrderItem.create! valid_attributes
expect {
delete :destroy, {:id => order_item.to_param}, valid_session
delete :destroy, {:id => order_item.to_param}
}.to change(OrderItem, :count).by(-1)
end
it "redirects to the order_items list" do
order_item = OrderItem.create! valid_attributes
delete :destroy, {:id => order_item.to_param}, valid_session
delete :destroy, {:id => order_item.to_param}
response.should redirect_to(order_items_url)
end
end

112
spec/controllers/orders_controller_spec.rb
View File

@@ -27,116 +27,4 @@ describe OrdersController do
assigns(:order).should eq(order)
end
end
describe "GET new" do
it "assigns a new order as @order" do
get :new, {}
assigns(:order).should be_a_new(Order)
end
end
describe "GET edit" do
it "assigns the requested order as @order" do
order = Order.create! valid_attributes
get :edit, {:id => order.to_param}
assigns(:order).should eq(order)
end
end
describe "POST create" do
describe "with valid params" do
it "creates a new Order" do
expect {
post :create, {:order => valid_attributes}
}.to change(Order, :count).by(1)
end
it "assigns a newly created order as @order" do
post :create, {:order => valid_attributes}
assigns(:order).should be_a(Order)
assigns(:order).should be_persisted
end
it "redirects to the created order" do
post :create, {:order => valid_attributes}
response.should redirect_to(Order.last)
end
end
describe "with invalid params" do
it "assigns a newly created but unsaved order as @order" do
# Trigger the behavior that occurs when invalid params are submitted
Order.any_instance.stub(:save).and_return(false)
post :create, {:order => { "member_id" => "invalid value" }}
assigns(:order).should be_a_new(Order)
end
it "re-renders the 'new' template" do
# Trigger the behavior that occurs when invalid params are submitted
Order.any_instance.stub(:save).and_return(false)
post :create, {:order => { "member_id" => "invalid value" }}
response.should render_template("new")
end
end
end
describe "PUT update" do
describe "with valid params" do
it "updates the requested order" do
order = Order.create! valid_attributes
# Assuming there are no other orders in the database, this
# specifies that the Order created on the previous line
# receives the :update_attributes message with whatever params are
# submitted in the request.
Order.any_instance.should_receive(:update_attributes).with({ "member_id" => "MyString" })
put :update, {:id => order.to_param, :order => { "member_id" => "MyString" }}
end
it "assigns the requested order as @order" do
order = Order.create! valid_attributes
put :update, {:id => order.to_param, :order => valid_attributes}
assigns(:order).should eq(order)
end
it "redirects to the order" do
order = Order.create! valid_attributes
put :update, {:id => order.to_param, :order => valid_attributes}
response.should redirect_to(order)
end
end
describe "with invalid params" do
it "assigns the order as @order" do
order = Order.create! valid_attributes
# Trigger the behavior that occurs when invalid params are submitted
Order.any_instance.stub(:save).and_return(false)
put :update, {:id => order.to_param, :order => { "member_id" => "invalid value" }}
assigns(:order).should eq(order)
end
it "re-renders the 'edit' template" do
order = Order.create! valid_attributes
# Trigger the behavior that occurs when invalid params are submitted
Order.any_instance.stub(:save).and_return(false)
put :update, {:id => order.to_param, :order => { "member_id" => "invalid value" }}
response.should render_template("edit")
end
end
end
describe "DELETE destroy" do
it "destroys the requested order" do
order = Order.create! valid_attributes
expect {
delete :destroy, {:id => order.to_param}
}.to change(Order, :count).by(-1)
end
it "redirects to the orders list" do
order = Order.create! valid_attributes
delete :destroy, {:id => order.to_param}
response.should redirect_to(orders_url)
end
end
end

11
spec/requests/order_items_spec.rb
View File

@@ -1,11 +0,0 @@
require 'spec_helper'
describe "OrderItems" do
describe "GET /order_items" do
it "works! (now write some real specs)" do
# Run the generator again with the --webrat flag if you want to use webrat methods/matchers
get order_items_path
response.status.should be(200)
end
end
end

18
spec/views/orders/edit.html.haml_spec.rb
View File

@@ -1,18 +0,0 @@
require 'spec_helper'
describe "orders/edit" do
before(:each) do
@order = assign(:order, stub_model(Order,
:member_id => "MyString"
))
end
it "renders the edit order form" do
render
# Run the generator again with the --webrat flag if you want to use webrat matchers
assert_select "form", :action => orders_path(@order), :method => "post" do
assert_select "input#order_member_id", :name => "order[member_id]"
end
end
end

18
spec/views/orders/new.html.haml_spec.rb
View File

@@ -1,18 +0,0 @@
require 'spec_helper'
describe "orders/new" do
before(:each) do
assign(:order, stub_model(Order,
:member_id => "MyString"
).as_new_record)
end
it "renders new order form" do
render
# Run the generator again with the --webrat flag if you want to use webrat matchers
assert_select "form", :action => orders_path, :method => "post" do
assert_select "input#order_member_id", :name => "order[member_id]"
end
end
end