mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-04-01 21:56:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

s/users/members/g -- all tests pass

Browse Source 
There's still probably stuff broken, but this seemed like a good spot to
commit.  Sorry for the enormous chunk of code.  I was attempting to
update the views, but found that I needed to update a few things
elsewhere as well to make them work.
This commit is contained in:
Skud
2013-01-13 18:33:43 +11:00
parent fdb309cdd2
commit edb59e07ee
57 changed files with 167 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/application_controller.rb
View File

@@ -1,7 +1,3 @@
class ApplicationController < ActionController::Base
protect_from_forgery
def current_user
@current_user ||= Member.find(session[:member_id])
end
end

2
app/controllers/gardens_controller.rb
View File

@@ -40,7 +40,7 @@ class GardensController < ApplicationController
# POST /gardens
# POST /gardens.json
def create
params[:garden][:member_id] = current_user.id
params[:garden][:member_id] = current_member.id
@garden = Garden.new(params[:garden])
respond_to do |format|

2
app/controllers/posts_controller.rb
View File

@@ -43,7 +43,7 @@ class PostsController < ApplicationController
# POST /posts
# POST /posts.json
def create
params[:post][:member_id] = current_user.id
params[:post][:member_id] = current_member.id
@post = Post.new(params[:post])
respond_to do |format|

4
app/views/crops/edit.html.haml
View File

@@ -1,9 +1,9 @@
- content_for :title, "Editing crop"
- if user_signed_in?
- if member_signed_in?
= render 'form'
%p
= link_to 'Show', @crop, { :class => 'btn' }
= link_to 'Back', crops_path, { :class => 'btn' }
- else
.alert You're not logged in. Only logged in users can do this.
.alert You're not logged in. Only logged in members can do this.

2
app/views/crops/index.html.haml
View File

@@ -13,6 +13,6 @@
- if (c % 6) == 0
.row
- if user_signed_in?
- if member_signed_in?
%div
= link_to 'New Crop', new_crop_path, {:class => 'btn'}

4
app/views/crops/new.html.haml
View File

@@ -1,11 +1,11 @@
- content_for :title, "New crop"
- if user_signed_in?
- if member_signed_in?
= render 'form'
%p
= link_to 'Show', @crop, { :class => 'btn' }
= link_to 'Back', crops_path, { :class => 'btn' }
- else
.alert You're not logged in. Only logged in users can do this.
.alert You're not logged in. Only logged in members can do this.
= link_to 'Back', crops_path

2
app/views/crops/show.html.haml
View File

@@ -25,6 +25,6 @@
%ul
%li= link_to 'Wikipedia (English)', @crop.en_wikipedia_url
%p
- if user_signed_in?
- if member_signed_in?
= link_to 'Edit', edit_crop_path(@crop), { :class => 'btn' }
= link_to 'Destroy', @crop, method: :delete, data: { confirm: 'Are you sure?' }, :class => 'btn'

6
app/views/gardens/edit.html.haml
View File

@@ -1,7 +1,7 @@
= content_for :title, "Edit garden"
- if user_signed_in?
- if current_user == @garden.owner
- if member_signed_in?
- if current_member == @garden.owner
= form_for @garden, :html => {:class => "form-horizontal"} do |f|
.control-group
= f.label :name, :class => "control-label"
@@ -11,4 +11,4 @@
- else
.alert You aren't allowed to edit this garden.
- else
.alert You're not logged in. Only logged in users can do this.
.alert You're not logged in. Only logged in members can do this.

2
app/views/gardens/index.html.haml
View File

@@ -12,7 +12,7 @@
- @gardens.each do |garden|
%tr
%td= garden.name
%td= garden.user_id
%td= garden.owner
%td= garden.slug
%td= link_to 'Show', garden
%td= link_to 'Edit', edit_garden_path(garden)

6
app/views/gardens/show.html.haml
View File

@@ -6,14 +6,14 @@
%h4= "#{@garden.owner}'s gardens"
%ul
- @garden.user.gardens.each do |othergarden|
- @garden.member.gardens.each do |othergarden|
%li
- if @garden == othergarden
= @garden.name
- else
= link_to "#{othergarden.name}", garden_path(othergarden)
- if current_user == @garden.owner
- if current_member == @garden.owner
= link_to 'Edit', edit_garden_path(@garden), :class => 'btn'
= link_to 'New', new_garden_path, :class => 'btn'
@@ -26,7 +26,7 @@
= link_to 'Updates', '#tab2', 'data-toggle' => 'tab'
.tab-content
.tab-pane.active#tab1
- if current_user == @garden.owner
- if current_member == @garden.owner
%p= link_to "Plant something", new_planting_path(:garden_id => @garden.id), :class => 'btn btn-large btn-primary'
.alert
%button.close{:type => 'button', 'data-dismiss' => 'alert'} ×

10
app/views/layouts/_header.html.haml
View File

@@ -11,13 +11,13 @@
%li= link_to "Crops", crops_path
%li= link_to "Members", members_path
%li= link_to "Posts", posts_path
- if user_signed_in?
- if member_signed_in?
%li= link_to("Post something", new_post_path)
%li= link_to("Plant something", new_planting_path)
%li.divider-vertical
%li= link_to current_user.username, member_path(current_user)
%li= link_to "Log out", destroy_user_session_path, :method => :delete
%li= link_to current_member.username, member_path(current_member)
%li= link_to "Log out", destroy_member_session_path, :method => :delete
- else
%li.divider-vertical
%li.pull-right= link_to 'Sign up', new_user_registration_path
%li.pull-right= link_to 'Log in', new_user_session_path
%li.pull-right= link_to 'Sign up', new_member_registration_path
%li.pull-right= link_to 'Log in', new_member_session_path

2
app/views/plantings/_form.html.haml
View File

@@ -12,7 +12,7 @@
.control-group
= f.label 'Where did you plant it?', :class => 'control-label'
.controls= collection_select(:planting, :garden_id,
Garden.where(:user_id => current_user), :id, :name, :selected => @garden.id)
Garden.where(:member_id => current_member), :id, :name, :selected => @garden.id)
.control-group
= f.label 'When?', :class => 'control-label'
.controls= f.date_select :planted_at, options = { :include_blank => true }, html_options = { :class => "span1" }

6
app/views/plantings/edit.html.haml
View File

@@ -1,11 +1,11 @@
= content_for :title, "Editing planting"
- if user_signed_in? && current_user == @planting.owner
- if member_signed_in? && current_member == @planting.owner
= render 'form'
- elsif user_signed_in?
- elsif member_signed_in?
.alert You don't have permission to edit this planting.
- else
.alert You're not logged in. Only logged in users can do this.
.alert You're not logged in. Only logged in members can do this.
= link_to 'Show', @planting
\|

2
app/views/plantings/index.html.haml
View File

@@ -21,7 +21,7 @@
%p
= link_to 'More...', p
- if user_signed_in? && current_user == p.owner
- if member_signed_in? && current_member == p.owner
%p
=link_to 'Edit', edit_planting_path(p), :class => 'btn'
=link_to 'Destroy', p, method: :delete, data: { confirm: 'Are you sure?' }, :class => 'btn'

4
app/views/plantings/new.html.haml
View File

@@ -1,8 +1,8 @@
=content_for :title, "Plant something"
- if user_signed_in?
- if member_signed_in?
= render 'form'
- else
.alert You're not logged in. Only logged in users can do this.
.alert You're not logged in. Only logged in members can do this.
= link_to 'Back', plantings_path

2
app/views/plantings/show.html.haml
View File

@@ -13,5 +13,5 @@
:markdown
#{ @planting.description != "" ? @planting.description : "No description." }
- if user_signed_in? && current_user == @planting.owner
- if member_signed_in? && current_member == @planting.owner
= link_to 'Edit', edit_planting_path(@planting), :class => 'btn'

4
app/views/posts/_form.html.haml
View File

@@ -7,8 +7,8 @@
%li= msg
.field
= f.label :user_id
= f.number_field :user_id
= f.label :member_id
= f.number_field :member_id
.field
= f.label :subject
= f.text_field :subject

6
app/views/posts/_single.html.haml
View File

@@ -2,14 +2,14 @@
.post
.row
.span1
= render :partial => "shared/avatar", :locals => { :member => post.user }
= render :partial => "shared/avatar", :locals => { :member => post.member }
.span7
- if subject
%h3= link_to strip_tags(post.subject), post
.post-meta
Posted by
= link_to post.user.username, member_path(post.user)
= link_to post.member.username, member_path(post.member)
at
= post.created_at
@@ -17,7 +17,7 @@
:markdown
#{ strip_tags post.body }
- if current_user == post.user
- if current_member == post.member
.post-actions
= link_to 'Edit', edit_post_path(post), :class => 'btn'
= link_to 'Delete', post, method: :delete, |

4
app/views/posts/edit.html.haml
View File

@@ -1,10 +1,10 @@
= content_for :title, "Edit post"
- if user_signed_in?
- if member_signed_in?
= form_for @post do |f|
= label_tag :subject, "Subject"
= f.text_field :subject, :class => 'input-block-level'
= f.text_area :body, :rows => 12, :class => 'input-block-level'
= f.submit "Post"
- else
.alert You're not logged in. Only logged in users can do this.
.alert You're not logged in. Only logged in members can do this.

2
app/views/posts/index.rss.builder
View File

@@ -6,7 +6,7 @@ xml.rss :version => "2.0" do
for post in @recent_posts
xml.item do
xml.author post.user.username
xml.author post.member.username
xml.title post.subject
xml.description post.body
xml.pubDate post.created_at.to_s(:rfc822)

4
app/views/posts/new.html.haml
View File

@@ -1,6 +1,6 @@
= content_for :title, "Post an post"
- if user_signed_in?
- if member_signed_in?
= form_for @post, :url => { :action => "create" } do |f|
%fieldset
= label_tag :post, "Subject"
@@ -9,6 +9,6 @@
= f.text_area :body, :rows => 12, :class => 'input-block-level'
= f.submit "Post", :class => 'btn'
- else
.alert You're not logged in. Only logged in users can do this.
.alert You're not logged in. Only logged in members can do this.
= link_to 'Back', posts_path

4
app/views/scientific_names/edit.html.haml
View File

@@ -1,9 +1,9 @@
%h1 Editing scientific_name
- if user_signed_in?
- if member_signed_in?
= render 'form'
%p
= link_to 'Show', @scientific_name, { :class => 'btn' }
= link_to 'Back', scientific_names_path, { :class => 'btn' }
- else
.alert You're not logged in. Only logged in users can do this.
.alert You're not logged in. Only logged in members can do this.

4
app/views/scientific_names/new.html.haml
View File

@@ -1,9 +1,9 @@
%h1 New scientific_name
- if user_signed_in?
- if member_signed_in?
= render 'form'
%p
= link_to 'Show', @scientific_name, { :class => 'btn' }
= link_to 'Back', scientific_names_path, { :class => 'btn' }
- else
.alert You're not logged in. Only logged in users can do this.
.alert You're not logged in. Only logged in members can do this.

12
spec/controllers/gardens_controller_spec.rb
View File

@@ -15,7 +15,7 @@ describe GardensController do
# in order to pass any filters (e.g. authentication) defined in
# GardensController. Be sure to keep this updated too.
def valid_session
{ :member_id => 1 }
{ }
end
describe "GET index" do
@@ -53,18 +53,18 @@ describe GardensController do
describe "with valid params" do
it "creates a new Garden" do
expect {
post :create, {:garden => valid_attributes}, valid_session
post :create, {:garden => valid_attributes}
}.to change(Garden, :count).by(1)
end
it "assigns a newly created garden as @garden" do
post :create, {:garden => valid_attributes}, valid_session
post :create, {:garden => valid_attributes}
assigns(:garden).should be_a(Garden)
assigns(:garden).should be_persisted
end
it "redirects to the created garden" do
post :create, {:garden => valid_attributes}, valid_session
post :create, {:garden => valid_attributes}
response.should redirect_to(Garden.last)
end
end
@@ -73,14 +73,14 @@ describe GardensController do
it "assigns a newly created but unsaved garden as @garden" do
# Trigger the behavior that occurs when invalid params are submitted
Garden.any_instance.stub(:save).and_return(false)
post :create, {:garden => {}}, valid_session
post :create, {:garden => {}}
assigns(:garden).should be_a_new(Garden)
end
it "re-renders the 'new' template" do
# Trigger the behavior that occurs when invalid params are submitted
Garden.any_instance.stub(:save).and_return(false)
post :create, {:garden => {}}, valid_session
post :create, {:garden => {}}
response.should render_template("new")
end
end

12
spec/controllers/posts_controller_spec.rb
View File

@@ -20,7 +20,7 @@ describe PostsController do
# in order to pass any filters (e.g. authentication) defined in
# PostsController. Be sure to keep this updated too.
def valid_session
{ :member_id => 1 }
{ }
end
describe "GET index" do
@@ -67,18 +67,18 @@ describe PostsController do
describe "with valid params" do
it "creates a new Post" do
expect {
post :create, {:post => valid_web_attributes}, valid_session
post :create, {:post => valid_web_attributes}
}.to change(Post, :count).by(1)
end
it "assigns a newly created post as @post" do
post :create, {:post => valid_web_attributes}, valid_session
post :create, {:post => valid_web_attributes}
assigns(:post).should be_a(Post)
assigns(:post).should be_persisted
end
it "redirects to the created post" do
post :create, {:post => valid_web_attributes}, valid_session
post :create, {:post => valid_web_attributes}
response.should redirect_to(Post.last)
end
end
@@ -87,14 +87,14 @@ describe PostsController do
it "assigns a newly created but unsaved post as @post" do
# Trigger the behavior that occurs when invalid params are submitted
Post.any_instance.stub(:save).and_return(false)
post :create, {:post => {}}, valid_session
post :create, {:post => {}}
assigns(:post).should be_a_new(Post)
end
it "re-renders the 'new' template" do
# Trigger the behavior that occurs when invalid params are submitted
Post.any_instance.stub(:save).and_return(false)
post :create, {:post => {}}, valid_session
post :create, {:post => {}}
response.should render_template("new")
end
end

6
spec/views/crops/edit.html.haml_spec.rb
View File

@@ -8,14 +8,14 @@ describe "crops/edit" do
context "logged out" do
it "doesn't show the crop form if logged out" do
render
rendered.should contain "Only logged in users can do this"
rendered.should contain "Only logged in members can do this"
end
end
context "logged in" do
before(:each) do
@user = FactoryGirl.create(:user)
sign_in @user
@member = FactoryGirl.create(:member)
sign_in @member
render
end

5
spec/views/crops/index.html.haml_spec.rb
View File

@@ -30,9 +30,8 @@ describe "crops/index" do
context "logged in" do
before(:each) do
@user = User.create(:email => "growstuff@example.com", :password => "irrelevant")
@user.confirm!
sign_in @user
@member = FactoryGirl.create(:member)
sign_in @member
render
end

6
spec/views/crops/new.html.haml_spec.rb
View File

@@ -8,15 +8,15 @@ describe "crops/new" do
context "logged out" do
it "doesn't show the crop form if logged out" do
render
rendered.should contain "Only logged in users can do this"
rendered.should contain "Only logged in members can do this"
end
end
context "logged in" do
before(:each) do
@user = FactoryGirl.create(:user)
sign_in @user
@member = FactoryGirl.create(:member)
sign_in @member
render
end

5
spec/views/crops/show.html.haml_spec.rb
View File

@@ -38,9 +38,8 @@ describe "crops/show" do
context "logged in" do
before(:each) do
@user = User.create(:email => "growstuff@example.com", :password => "irrelevant")
@user.confirm!
sign_in @user
@member = FactoryGirl.create(:member)
sign_in @member
render
end

10
spec/views/devise/confirmations/new_spec.rb
View File

@@ -1,14 +1,14 @@
describe 'devise/confirmations/new.html.haml', :type => "view" do
before(:each) do
@view.stub(:resource).and_return(User.new)
@view.stub(:resource_name).and_return("user")
@view.stub(:resource_class).and_return(User)
@view.stub(:devise_mapping).and_return(Devise.mappings[:user])
@view.stub(:resource).and_return(Member.new)
@view.stub(:resource_name).and_return("member")
@view.stub(:resource_class).and_return(Member)
@view.stub(:devise_mapping).and_return(Devise.mappings[:member])
render
end
it 'should contain a login field' do
rendered.should contain "Username or email"
rendered.should contain "Enter either your username or your email address"
end
end

8
spec/views/devise/mailer/confirmation_instructions_spec.rb
View File

@@ -4,14 +4,12 @@ describe 'devise/mailer/confirmation_instructions.html.haml', :type => "view" do
context "logged in" do
before(:each) do
@resource = mock_model(User)
@resource.stub!(:email).and_return("example@example.com")
@resource.stub!(:confirmation_token).and_return("fred")
render
@resource = FactoryGirl.create(:member)
render
end
it 'should have a confirmation link' do
rendered.should contain 'Confirm my account'
rendered.should contain 'Confirm my account'
end
end
end

6
spec/views/devise/mailer/reset_password_instructions_spec.rb
View File

@@ -4,15 +4,15 @@ describe 'devise/mailer/reset_password_instructions.html.haml', :type => "view"
context "logged in" do
before(:each) do
@resource = mock_model(User)
@resource = mock_model(Member)
@resource.stub!(:email).and_return("example@example.com")
@resource.stub!(:reset_password_token).and_return("joe")
render
end
it 'should have some of the right text' do
rendered.should contain 'Change my password'
rendered.should contain 'please ignore this email'
rendered.should contain 'Change my password'
rendered.should contain 'please ignore this email'
end
end
end

2
spec/views/devise/mailer/unlock_instructions_spec.rb
View File

@@ -1,7 +1,7 @@
describe 'devise/mailer/unlock_instructions.html.haml', :type => "view" do
context "logged in" do
before(:each) do
@resource = mock_model(User)
@resource = mock_model(Member)
@resource.should_receive(:email).and_return("example@example.com")
@resource.should_receive(:unlock_token).and_return("fred")
render

8
spec/views/devise/registrations/edit_spec.rb
View File

@@ -4,10 +4,10 @@ describe 'devise/registrations/edit.html.erb', :type => "view" do
context "logged in" do
before(:each) do
@view.stub(:resource).and_return(User.new)
@view.stub(:resource_name).and_return("user")
@view.stub(:resource_class).and_return(User)
@view.stub(:devise_mapping).and_return(Devise.mappings[:user])
@view.stub(:resource).and_return(Member.new)
@view.stub(:resource_name).and_return("member")
@view.stub(:resource_class).and_return(Member)
@view.stub(:devise_mapping).and_return(Devise.mappings[:member])
render
end

8
spec/views/devise/registrations/new_spec.rb
View File

@@ -4,10 +4,10 @@ describe 'devise/registrations/new.html.haml', :type => "view" do
context "logged in" do
before(:each) do
@view.stub(:resource).and_return(User.new)
@view.stub(:resource_name).and_return("user")
@view.stub(:resource_class).and_return(User)
@view.stub(:devise_mapping).and_return(Devise.mappings[:user])
@view.stub(:resource).and_return(Member.new)
@view.stub(:resource_name).and_return("member")
@view.stub(:resource_class).and_return(Member)
@view.stub(:devise_mapping).and_return(Devise.mappings[:member])
render
end

8
spec/views/devise/sessions/new_spec.rb
View File

@@ -4,10 +4,10 @@ describe 'devise/sessions/new.html.haml', :type => "view" do
context "logged in" do
before(:each) do
@view.stub(:resource).and_return(User.new)
@view.stub(:resource_name).and_return("user")
@view.stub(:resource_class).and_return(User)
@view.stub(:devise_mapping).and_return(Devise.mappings[:user])
@view.stub(:resource).and_return(Member.new)
@view.stub(:resource_name).and_return("member")
@view.stub(:resource_class).and_return(Member)
@view.stub(:devise_mapping).and_return(Devise.mappings[:member])
render
end

4
spec/views/devise/shared/_links_spec.rb
View File

@@ -12,7 +12,7 @@ describe 'devise/shared/_links.haml', :type => "view" do
it 'should have a sign-in link if not in sessions' do
@view.stub(:controller_name).and_return("anything but sessions")
@view.stub(:resource_name).and_return("user")
@view.stub(:resource_name).and_return("member")
@view.stub(:devise_mapping =>
devise_mapping(false, false, false, false, false))
render
@@ -20,7 +20,7 @@ describe 'devise/shared/_links.haml', :type => "view" do
it "shouldn't have a sign-in link if in sessions" do
@view.stub(:controller_name).and_return("sessions")
@view.stub(:resource_name).and_return("user")
@view.stub(:resource_name).and_return("member")
@view.stub(:devise_mapping =>
devise_mapping(false, false, false, false, false))
render

8
spec/views/devise/unlocks/new_spec.rb
View File

@@ -4,10 +4,10 @@ describe 'devise/unlocks/new.html.haml', :type => "view" do
context "logged in" do
before(:each) do
@view.stub(:resource).and_return(User.new)
@view.stub(:resource_name).and_return("user")
@view.stub(:resource_class).and_return(User)
@view.stub(:devise_mapping).and_return(Devise.mappings[:user])
@view.stub(:resource).and_return(Member.new)
@view.stub(:resource_name).and_return("member")
@view.stub(:resource_class).and_return(Member)
@view.stub(:devise_mapping).and_return(Devise.mappings[:member])
render
end

8
spec/views/gardens/edit.html.haml_spec.rb
View File

@@ -5,15 +5,15 @@ describe "gardens/edit" do
context "logged out" do
it "doesn't show the garden editing form if logged out" do
render
rendered.should contain "Only logged in users can do this"
rendered.should contain "Only logged in members can do this"
end
end
context "logged in" do
before(:each) do
@user = FactoryGirl.create(:user)
sign_in @user
@garden = assign(:garden, FactoryGirl.create(:garden, :user => @user))
@member = FactoryGirl.create(:member)
sign_in @member
@garden = assign(:garden, FactoryGirl.create(:garden, :member => @member))
render
end

6
spec/views/gardens/index.html.haml_spec.rb
View File

@@ -2,10 +2,10 @@ require 'spec_helper'
describe "gardens/index" do
before(:each) do
@user = FactoryGirl.create(:user)
@member = FactoryGirl.create(:member)
assign(:gardens, [
FactoryGirl.create(:garden, :user => @user),
FactoryGirl.create(:garden, :user => @user)
FactoryGirl.create(:garden, :member => @member),
FactoryGirl.create(:garden, :member => @member)
])
end

6
spec/views/gardens/show.html.haml_spec.rb
View File

@@ -2,8 +2,8 @@ require 'spec_helper'
describe "gardens/show" do
before(:each) do
@user = FactoryGirl.create(:user)
@garden = assign(:garden, FactoryGirl.create(:garden, :user => @user))
@member = FactoryGirl.create(:member)
@garden = assign(:garden, FactoryGirl.create(:garden, :member => @member))
end
context 'logged out' do
@@ -16,7 +16,7 @@ describe "gardens/show" do
context 'signed in' do
before :each do
sign_in @user
sign_in @member
render
end

2
spec/views/layouts/_footer_spec.rb
View File

@@ -1,7 +1,7 @@
require 'spec_helper'
describe 'layouts/_footer.html.haml', :type => "view" do
before(:each) do
render
end

15
spec/views/layouts/application_spec.rb
View File

@@ -4,8 +4,8 @@ describe 'layouts/application.html.haml', :type => "view" do
context "when not logged in" do
before(:each) do
view.stub(:user_signed_in).and_return(false)
view.stub(:current_user).and_return(nil)
view.stub(:member_signed_in).and_return(false)
view.stub(:current_member).and_return(nil)
render
end
@@ -24,18 +24,13 @@ describe 'layouts/application.html.haml', :type => "view" do
context "logged in" do
before(:each) do
@user = User.create(
:username => "test_user",
:email => "growstuff@example.com",
:password => "irrelevant"
)
@user.confirm!
sign_in @user
@member = FactoryGirl.create(:member)
sign_in @member
render
end
it 'should show username' do
rendered.should contain 'test_user'
rendered.should contain 'member1'
end
it 'should have a "Post" link' do

8
spec/views/members/index.html.haml_spec.rb
View File

@@ -3,8 +3,8 @@ require 'spec_helper'
describe "members/index" do
before(:each) do
assign(:members, [
FactoryGirl.create(:user),
FactoryGirl.create(:long_name_user)
FactoryGirl.create(:member),
FactoryGirl.create(:long_name_member)
])
render
end
@@ -14,8 +14,8 @@ describe "members/index" do
end
it "does not truncate short names" do
rendered.should contain "user1"
rendered.should_not contain "user1..."
rendered.should contain "member1"
rendered.should_not contain "member1..."
end
it "counts the number of members" do

10
spec/views/members/show.html.haml_spec.rb
View File

@@ -3,7 +3,7 @@ require 'spec_helper'
describe "members/show" do
before(:each) do
@member = FactoryGirl.create(:user)
@member = FactoryGirl.create(:member)
@time = @member.created_at
# need @garden to render the page
@@ -26,7 +26,7 @@ describe "members/show" do
end
end
context "signed in user" do
context "signed in member" do
before(:each) do
sign_in @member
render
@@ -37,13 +37,13 @@ describe "members/show" do
end
end
context "user has a garden" do
context "member has a garden" do
before(:each) do
@member.gardens.create(:name => 'My Garden', :user_id => @member.id)
@member.gardens.create(:name => 'My Garden', :member_id => @member.id)
render
end
it "displays a garden, if the user has one" do
it "displays a garden, if the member has one" do
rendered.should contain "My Garden"
end
end

8
spec/views/members/show.rss.builder_spec.rb
View File

@@ -2,16 +2,16 @@ require 'spec_helper'
describe 'members/show.rss.builder', :type => "view" do
before(:each) do
@member = assign(:member, FactoryGirl.create(:user))
@member = assign(:member, FactoryGirl.create(:member))
assign(:posts, [
FactoryGirl.build(:post, :id => 1, :user => @member),
FactoryGirl.build(:post, :id => 2, :user => @member)
FactoryGirl.build(:post, :id => 1, :member => @member),
FactoryGirl.build(:post, :id => 2, :member => @member)
])
render
end
it 'shows RSS feed title' do
rendered.should contain "user1's recent posts"
rendered.should contain "member1's recent posts"
end
it 'shows content of posts' do

25
spec/views/plantings/edit.html.haml_spec.rb
View File

@@ -2,24 +2,17 @@ require 'spec_helper'
describe "plantings/edit" do
before(:each) do
@right_user = User.create!(
@right_member = FactoryGirl.create(:member,
:username => 'right',
:email => "growstuff@example.com",
:password => 'irrelevant',
:tos_agreement => true
:email => 'right@example.com'
)
@right_user.confirm!
@wrong_user = User.create!(
@wrong_member = FactoryGirl.create(:member,
:username => 'wrong',
:email => "growstuff2@example.com",
:password => 'irrelevant',
:tos_agreement => true
:email => 'wrong@example.com'
)
@wrong_user.confirm!
@crop = FactoryGirl.create(:crop)
@garden = FactoryGirl.create(:garden, :user => @right_user)
@garden = FactoryGirl.create(:garden, :member => @right_member)
@planting = assign(:planting,
FactoryGirl.create(:planting, :garden => @garden, :crop => @crop)
@@ -30,13 +23,13 @@ describe "plantings/edit" do
context "logged out" do
it "doesn't show the planting form if logged out" do
render
rendered.should contain "Only logged in users can do this"
rendered.should contain "Only logged in members can do this"
end
end
context "wrong user" do
context "wrong member" do
before(:each) do
sign_in @wrong_user
sign_in @wrong_member
render
end
@@ -48,7 +41,7 @@ describe "plantings/edit" do
context "logged in" do
before(:each) do
sign_in @right_user
sign_in @right_member
render
end

6
spec/views/plantings/index.html.haml_spec.rb
View File

@@ -2,8 +2,8 @@ require 'spec_helper'
describe "plantings/index" do
before(:each) do
@user = FactoryGirl.create(:user)
@garden = FactoryGirl.create(:garden, :user => @user)
@member = FactoryGirl.create(:member)
@garden = FactoryGirl.create(:garden, :member => @member)
@tomato = FactoryGirl.create(:tomato)
@maize = FactoryGirl.create(:maize)
assign(:recent_plantings, [
@@ -24,7 +24,7 @@ describe "plantings/index" do
it "renders a list of plantings" do
rendered.should contain 'Tomato'
rendered.should contain 'Maize'
rendered.should contain "user1's My Garden"
rendered.should contain "member1's My Garden"
end
it "shows descriptions where they exist" do

10
spec/views/plantings/new.html.haml_spec.rb
View File

@@ -2,11 +2,11 @@ require 'spec_helper'
describe "plantings/new" do
before(:each) do
@user = FactoryGirl.create(:user)
@member = FactoryGirl.create(:member)
# create gardens and crops to populate dropdowns
@garden1 = FactoryGirl.create(:garden, :user => @user, :name => 'Garden1')
@garden2 = FactoryGirl.create(:garden, :user => @user, :name => 'Garden2')
@garden1 = FactoryGirl.create(:garden, :member => @member, :name => 'Garden1')
@garden2 = FactoryGirl.create(:garden, :member => @member, :name => 'Garden2')
@crop1 = FactoryGirl.create(:tomato)
@crop2 = FactoryGirl.create(:maize)
@@ -17,13 +17,13 @@ describe "plantings/new" do
context "logged out" do
it "doesn't show the planting form if logged out" do
render
rendered.should contain "Only logged in users can do this"
rendered.should contain "Only logged in members can do this"
end
end
context "logged in" do
before(:each) do
sign_in @user
sign_in @member
assign(:crop, @crop2)
assign(:garden, @garden2)
render

4
spec/views/plantings/show.html.haml_spec.rb
View File

@@ -2,8 +2,8 @@ require 'spec_helper'
describe "plantings/show" do
before(:each) do
@user = FactoryGirl.create(:user)
@garden = FactoryGirl.create(:garden, :user => @user)
@member = FactoryGirl.create(:member)
@garden = FactoryGirl.create(:garden, :member => @member)
@crop = FactoryGirl.create(:tomato)
@planting = assign(:planting,
FactoryGirl.create(:planting, :garden => @garden, :crop => @crop)

8
spec/views/posts/edit.html.haml_spec.rb
View File

@@ -2,20 +2,20 @@ require 'spec_helper'
describe "posts/edit" do
before(:each) do
@user = FactoryGirl.create(:user)
@post = assign(:post, FactoryGirl.create(:post, :user => @user))
@member = FactoryGirl.create(:member)
@post = assign(:post, FactoryGirl.create(:post, :member => @member))
end
context "logged out" do
it "doesn't show the post form if logged out" do
render
rendered.should contain "Only logged in users can do this"
rendered.should contain "Only logged in members can do this"
end
end
context "logged in" do
before(:each) do
sign_in @user
sign_in @member
render
end

6
spec/views/posts/index.html.haml_spec.rb
View File

@@ -2,9 +2,9 @@ require 'spec_helper'
describe "posts/index" do
before(:each) do
@member = FactoryGirl.create(:user)
@post1 = FactoryGirl.build(:post, :user => @member)
@post2 = FactoryGirl.build(:post, :user => @member)
@member = FactoryGirl.create(:member)
@post1 = FactoryGirl.build(:post, :member => @member)
@post2 = FactoryGirl.build(:post, :member => @member)
assign(:posts, [@post1, @post2])
render
end

6
spec/views/posts/index.rss.builder_spec.rb
View File

@@ -2,10 +2,10 @@ require 'spec_helper'
describe 'posts/index.rss.builder', :type => "view" do
before(:each) do
@member = FactoryGirl.create(:user)
@member = FactoryGirl.create(:member)
assign(:recent_posts, [
FactoryGirl.build(:post, :id => 1, :user => @member),
FactoryGirl.build(:post, :id => 2, :user => @member)
FactoryGirl.build(:post, :id => 1, :member => @member),
FactoryGirl.build(:post, :id => 2, :member => @member)
])
render
end

8
spec/views/posts/new.html.haml_spec.rb
View File

@@ -2,20 +2,20 @@ require 'spec_helper'
describe "posts/new" do
before(:each) do
@user = FactoryGirl.create(:user)
assign(:post, FactoryGirl.create(:post, :user => @user))
@member = FactoryGirl.create(:member)
assign(:post, FactoryGirl.create(:post, :member => @member))
end
context "logged out" do
it "doesn't show the post form if logged out" do
render
rendered.should contain "Only logged in users can do this"
rendered.should contain "Only logged in members can do this"
end
end
context "logged in" do
before(:each) do
sign_in @user
sign_in @member
render
end

10
spec/views/posts/show.html.haml_spec.rb
View File

@@ -2,15 +2,15 @@ require 'spec_helper'
describe "posts/show" do
before(:each) do
@user = FactoryGirl.create(:user)
@member = FactoryGirl.create(:member)
end
it "renders the post" do
@post = assign(:post,
FactoryGirl.create(:post, :user => @user))
FactoryGirl.create(:post, :member => @member))
render
# show the name of the member who posted the post
rendered.should match(/user1/)
rendered.should match(/member1/)
# Subject goes in title
rendered.should match(/This is some text./)
# shouldn't show the subject on a single post page
@@ -20,14 +20,14 @@ describe "posts/show" do
it "should parse markdown into html" do
@post = assign(:post,
FactoryGirl.create(:markdown_post, :user => @user))
FactoryGirl.create(:markdown_post, :member => @member))
render
assert_select "strong", "strong"
end
it "shouldn't let html through in body" do
@post = assign(:post,
FactoryGirl.create(:html_post, :user => @user))
FactoryGirl.create(:html_post, :member => @member))
render
rendered.should match(/EVIL/)
rendered.should_not match(/a href="http:\/\/evil.com"/)

6
spec/views/scientific_names/edit.html.haml_spec.rb
View File

@@ -10,14 +10,14 @@ describe "scientific_names/edit" do
context "logged out" do
it "doesn't show the SN form if logged out" do
render
rendered.should contain "Only logged in users can do this"
rendered.should contain "Only logged in members can do this"
end
end
context "logged in" do
before(:each) do
@user = FactoryGirl.create(:user)
sign_in @user
@member = FactoryGirl.create(:member)
sign_in @member
render
end

6
spec/views/scientific_names/new.html.haml_spec.rb
View File

@@ -8,14 +8,14 @@ describe "scientific_names/new" do
context "logged out" do
it "doesn't show the SN form if logged out" do
render
rendered.should contain "Only logged in users can do this"
rendered.should contain "Only logged in members can do this"
end
end
context "logged in" do
before(:each) do
@user = FactoryGirl.create(:user)
sign_in @user
@member = FactoryGirl.create(:member)
sign_in @member
render
end