diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb index f53faded3..40a50f161 100644 --- a/app/controllers/members_controller.rb +++ b/app/controllers/members_controller.rb @@ -5,7 +5,6 @@ class MembersController < ApplicationController respond_to do |format| format.html # index.html.haml - format.json { render json: @members} end end @@ -19,7 +18,6 @@ class MembersController < ApplicationController respond_to do |format| format.html # show.html.haml - format.json { render json: @member } format.rss { render( :layout => false, :locals => { :member => @member } diff --git a/spec/controllers/member_controller_spec.rb b/spec/controllers/member_controller_spec.rb index 781a7e656..bc928fbe4 100644 --- a/spec/controllers/member_controller_spec.rb +++ b/spec/controllers/member_controller_spec.rb @@ -3,29 +3,37 @@ require 'spec_helper' describe MembersController do before :each do - @member1 = FactoryGirl.create(:member, :login_name => 'fred') - @member2 = FactoryGirl.create(:unconfirmed_member, :login_name => 'bob') + @member1 = FactoryGirl.create(:member) @posts = [ FactoryGirl.create(:post, :author => @member1) ] end describe "GET index" do - it "assigns only confirmed members as @members" do - member = Member.find('fred') + it "assigns only confirmed members as @member1s" do get :index, {} - assigns(:members).should eq([member]) + assigns(:members).should eq([@member1]) + end + end + + describe "GET JSON index" do + it "does NOT provide JSON for members" do + get :index, :format => 'json' + response.should_not be_success end end describe "GET show" do - it "assigns the requested member as @member" do - member = Member.find('fred') - get :show, {:id => member.id} - assigns(:member).should eq(member) + it "assigns the requested member as @member1" do + get :show, {:id => @member1.id} + assigns(:member).should eq(@member1) + end + + it "does NOT provide JSON for member profile" do + get :show, { :id => @member1.id , :format => 'json' } + response.should_not be_success end it "assigns @posts with the member's posts" do - member = Member.find('fred') - get :show, {:id => member.id} + get :show, {:id => @member1.id} assigns(:posts).should eq(@posts) end @@ -34,16 +42,15 @@ describe MembersController do end it "doesn't show unconfirmed members" do - member = Member.find('bob') - lambda { get :show, {:id => member.id} }.should raise_error + @member2 = FactoryGirl.create(:unconfirmed_member) + lambda { get :show, {:id => @member2.id} }.should raise_error end end describe "GET member's RSS feed" do it "returns an RSS feed" do - member = Member.find('fred') - get :show, { :id => member.to_param, :format => "rss" } + get :show, { :id => @member1.to_param, :format => "rss" } response.should be_success response.should render_template("members/show") response.content_type.should eq("application/rss+xml")