mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-02-02 05:31:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into payments-new

Browse Source
This commit is contained in:
Skud
2013-05-15 11:37:16 +10:00
parent 2563787dc7 c7efe512aa
commit 1d54a63f5d
52 changed files with 390 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -6,3 +6,4 @@
*~
*.DS_Store
credentials.sh
Pathogen:

5
app/controllers/notifications_controller.rb
View File

@@ -1,4 +1,5 @@
class NotificationsController < ApplicationController
include NotificationsHelper
load_and_authorize_resource
# GET /notifications
def index
@@ -14,6 +15,7 @@ class NotificationsController < ApplicationController
@notification = Notification.find(params[:id])
@notification.read = true
@notification.save
@reply_link = reply_link(@notification)
respond_to do |format|
format.html # show.html.erb
@@ -25,6 +27,7 @@ class NotificationsController < ApplicationController
def new
@notification = Notification.new
@recipient = Member.find_by_id(params[:recipient_id])
@subject = params[:subject] || ""
respond_to do |format|
format.html # new.html.erb
@@ -49,7 +52,7 @@ class NotificationsController < ApplicationController
respond_to do |format|
if @notification.save
format.html { redirect_to @recipient, notice: 'Message was successfully sent.' }
format.html { redirect_to notifications_path, notice: 'Message was successfully sent.' }
else
format.html { render action: "new" }
end

3
app/controllers/plantings_controller.rb
View File

@@ -85,10 +85,11 @@ class PlantingsController < ApplicationController
# DELETE /plantings/1.json
def destroy
@planting = Planting.find(params[:id])
@garden = @planting.garden
@planting.destroy
respond_to do |format|
format.html { redirect_to plantings_url }
format.html { redirect_to @garden }
format.json { head :no_content }
end
end

8
app/controllers/scientific_names_controller.rb
View File

@@ -26,6 +26,7 @@ class ScientificNamesController < ApplicationController
# GET /scientific_names/new.json
def new
@scientific_name = ScientificName.new
@crop = Crop.find_by_id(params[:crop_id]) || Crop.new
respond_to do |format|
format.html # new.html.haml
@@ -45,7 +46,7 @@ class ScientificNamesController < ApplicationController
respond_to do |format|
if @scientific_name.save
format.html { redirect_to @scientific_name, notice: 'Scientific name was successfully created.' }
format.html { redirect_to @scientific_name.crop, notice: 'Scientific name was successfully created.' }
format.json { render json: @scientific_name, status: :created, location: @scientific_name }
else
format.html { render action: "new" }
@@ -61,7 +62,7 @@ class ScientificNamesController < ApplicationController
respond_to do |format|
if @scientific_name.update_attributes(params[:scientific_name])
format.html { redirect_to @scientific_name, notice: 'Scientific name was successfully updated.' }
format.html { redirect_to @scientific_name.crop, notice: 'Scientific name was successfully updated.' }
format.json { head :no_content }
else
format.html { render action: "edit" }
@@ -74,10 +75,11 @@ class ScientificNamesController < ApplicationController
# DELETE /scientific_names/1.json
def destroy
@scientific_name = ScientificName.find(params[:id])
@crop = @scientific_name.crop
@scientific_name.destroy
respond_to do |format|
format.html { redirect_to scientific_names_url }
format.html { redirect_to @crop }
format.json { head :no_content }
end
end

7
app/helpers/application_helper.rb
View File

@@ -1,7 +0,0 @@
module ApplicationHelper
def random_crop
Crop.random
end
end

2
app/helpers/comments_helper.rb
View File

@@ -1,2 +0,0 @@
module CommentsHelper
end

2
app/helpers/crops_helper.rb
View File

@@ -1,2 +0,0 @@
module CropsHelper
end

2
app/helpers/forums_helper.rb
View File

@@ -1,2 +0,0 @@
module ForumsHelper
end

2
app/helpers/gardens_helper.rb
View File

@@ -1,2 +0,0 @@
module GardensHelper
end

2
app/helpers/home_helper.rb
View File

@@ -1,2 +0,0 @@
module HomeHelper
end

9
app/helpers/members_helper.rb
View File

@@ -1,9 +0,0 @@
module MembersHelper
def shorten(str, max_length)
if str.length > max_length
return str.slice(0, max_length - 3) + "..."
else
return str
end
end
end

14
app/helpers/notifications_helper.rb
View File

@@ -1,2 +1,16 @@
module NotificationsHelper
def reply_link(notification)
if notification.post
# comment on the post in question
new_comment_url(:post_id => notification.post.id)
else
# by default, reply link sends a PM in return
new_notification_url(
:recipient_id => notification.sender.id,
:subject => notification.subject =~ /^Re: / ?
notification.subject :
"Re: " + notification.subject
)
end
end
end

2
app/helpers/plantings_helper.rb
View File

@@ -1,2 +0,0 @@
module PlantingsHelper
end

2
app/helpers/posts_helper.rb
View File

@@ -1,2 +0,0 @@
module PostsHelper
end

2
app/helpers/roles_helper.rb
View File

@@ -1,2 +0,0 @@
module RolesHelper
end

2
app/helpers/scientific_names_helper.rb
View File

@@ -1,2 +0,0 @@
module ScientificNamesHelper
end

3
app/mailers/notifier.rb
View File

@@ -1,8 +1,11 @@
class Notifier < ActionMailer::Base
include NotificationsHelper
default from: "Growstuff <noreply@growstuff.org>"
def notify(notification)
@notification = notification
@reply_link = reply_link(@notification)
mail(:to => @notification.recipient.email,
:subject => @notification.subject)
end

6
app/models/crop.rb
View File

@@ -6,6 +6,12 @@ class Crop < ActiveRecord::Base
has_many :plantings
default_scope order("lower(system_name) asc")
validates :en_wikipedia_url,
:format => {
:with => /^https?:\/\/en\.wikipedia\.org\/wiki/,
:message => 'is not a valid English Wikipedia URL'
}
def Crop.random
@crop = Crop.offset(rand(Crop.count)).first
return @crop

7
app/models/garden.rb
View File

@@ -7,8 +7,15 @@ class Garden < ActiveRecord::Base
has_many :plantings, :order => 'created_at DESC', :dependent => :destroy
has_many :crops, :through => :plantings
# before_create :replace_blank_name
default_scope order("lower(name) asc")
validates :name,
:format => {
:with => /\S/
}
def garden_slug
"#{owner.login_name}-#{name}".downcase.gsub(' ', '-')
end

7
app/models/notification.rb
View File

@@ -9,12 +9,19 @@ class Notification < ActiveRecord::Base
default_scope order('created_at DESC')
scope :unread, where(:read => false)
before_create :replace_blank_subject
after_create :send_email
def self.unread_count
self.unread.count
end
def replace_blank_subject
if self.subject.nil? or self.subject =~ /^\s*$/
self.subject = "(no subject)"
end
end
def send_email
if self.recipient.send_notification_email
Notifier.notify(self).deliver

5
app/models/post.rb
View File

@@ -10,6 +10,11 @@ class Post < ActiveRecord::Base
default_scope order("created_at desc")
validates :subject,
:format => {
:with => /\S/
}
def author_date_subject
# slugs are created before created_at is set
time = created_at || Time.zone.now

28
app/views/crops/_form.html.haml
View File

@@ -1,4 +1,4 @@
= form_for @crop do |f|
= form_for @crop, :html => {:class => 'form-horizontal'} do |f|
- if @crop.errors.any?
#error_explanation
%h3= "#{pluralize(@crop.errors.count, "error")} prohibited this crop from being saved:"
@@ -6,11 +6,21 @@
- @crop.errors.full_messages.each do |msg|
%li= msg
.field
= f.label :system_name
= f.text_field :system_name
.field
= f.label :en_wikipedia_url
= f.text_field :en_wikipedia_url
.actions
= f.submit 'Save'
%p
%span.help-block
For detailed crop wrangling guidelines, please consult the
=link_to "crop wrangling guide", "http://wiki.growstuff.org/index.php/Crop_wrangling"
on the Growstuff wiki.
.control-group
= f.label :system_name, :class => 'control-label'
.controls
= f.text_field :system_name
%span.help-inline Name in US English; singular; capitalize proper nouns only.
.control-group
= f.label :en_wikipedia_url, 'Wikipedia URL', :class => 'control-label'
.controls
= f.text_field :en_wikipedia_url
%span.help-inline Link to this crop's page on the English language Wikipedia.
.form-actions
= f.submit 'Save', :class => 'btn btn-primary'

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

@@ -17,19 +17,30 @@
%p= link_to "Plant this", new_planting_path(:crop_id => @crop.id), :class => 'btn btn-primary'
.span3
- if can? :edit, @crop or can? :destroy, @crop
%h4 Crop wrangling
%p
You are a
= succeed "." do
%strong CROP WRANGLER
%p
- if can? :edit, @crop
= link_to 'Edit crop', edit_crop_path(@crop), { :class => 'btn btn-mini' }
- if can? :destroy, @crop
= link_to 'Delete crop', @crop, method: :delete, data: { confirm: 'Are you sure?' }, :class => 'btn btn-mini'
%h4 Scientific names:
%ul
- @crop.scientific_names.each do |sn|
%li= sn.scientific_name
%li
= sn.scientific_name
- if can? :edit, sn
= link_to 'Edit', edit_scientific_name_path(sn), { :class => 'btn btn-mini' }
- if can? :destroy, sn
= link_to 'Delete', sn, method: :delete, data: { confirm: 'Are you sure?' }, :class => 'btn btn-mini'
%p
- if can? :edit, @crop
= link_to 'Add', new_scientific_name_path( :crop_id => @crop.id ), { :class => 'btn btn-mini' }
%h4 More information:
%ul
%li= link_to 'Wikipedia (English)', @crop.en_wikipedia_url
- if can? :edit, @crop or can? :destroy, @crop
%h4 Crop wrangling:
%p
- if can? :edit, @crop
= link_to 'Edit', edit_crop_path(@crop), { :class => 'btn btn-mini' }
- if can? :destroy, @crop
= link_to 'Delete', @crop, method: :delete, data: { confirm: 'Are you sure?' }, :class => 'btn btn-mini'

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

@@ -9,7 +9,7 @@
-if can? :create, Notification and current_member != @member
%p
%br/
=link_to 'Send Message', new_notification_path(:sender_id => current_member.id, :recipient_id => @member.id), :class => 'btn btn-primary'
=link_to 'Send Message', new_notification_path(:recipient_id => @member.id), :class => 'btn btn-primary'
%p
%strong Member since:

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

@@ -13,7 +13,7 @@
To:
= link_to @recipient, @recipient
= label_tag :notification, "Subject:"
= f.text_field :subject, :class => 'input-block-level'
= f.text_field :subject, :value => @subject, :class => 'input-block-level'
= label_tag :body, "Type your message here:"
= f.text_area :body, :rows => 12, :class => 'input-block-level'
%span.help-block

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

@@ -1,4 +1,4 @@
- content_for :title, "Notifications"
- content_for :title, "Inbox"
- if @notifications.length > 0
%table.table.table-striped

3
app/views/notifications/show.html.haml
View File

@@ -15,4 +15,5 @@
#{ strip_tags(@notification.body) }
%p
=link_to 'Delete', @notification, method: :delete, data: { confirm: 'Are you sure?' }, :class => 'btn btn-mini'
=link_to 'Delete', @notification, method: :delete, data: { confirm: 'Are you sure?' }, :class => 'btn'
=link_to 'Reply', @reply_link, :class => 'btn btn-primary'

2
app/views/notifier/notify.html.haml
View File

@@ -14,6 +14,8 @@
#{strip_tags @notification.body}
%p
= link_to "Reply to this message", @reply_link
%br/
= link_to "View this message in your inbox", notification_url(@notification)
%br/
= link_to "Turn off these notifications", edit_member_registration_url

26
app/views/scientific_names/_form.html.haml
View File

@@ -1,4 +1,4 @@
= form_for @scientific_name do |f|
= form_for @scientific_name, :html => {:class => 'form-horizontal'} do |f|
- if @scientific_name.errors.any?
#error_explanation
%h2= "#{pluralize(@scientific_name.errors.count, "error")} prohibited this scientific_name from being saved:"
@@ -6,11 +6,19 @@
- @scientific_name.errors.full_messages.each do |msg|
%li= msg
.field
= f.label :scientific_name
= f.text_field :scientific_name
.field
= f.label :crop_id
= f.number_field :crop_id
.actions
= f.submit 'Save'
%p
%span.help-block
For detailed crop wrangling guidelines, please consult the
=link_to "crop wrangling guide", "http://wiki.growstuff.org/index.php/Crop_wrangling"
on the Growstuff wiki.
.control-group
= f.label :crop_id, :class => 'control-label'
.controls
= collection_select(:scientific_name, :crop_id, Crop.all, :id, :system_name, :selected => @scientific_name.crop_id || @crop.id)
.control-group
= f.label :scientific_name, :class => 'control-label'
.controls
= f.text_field :scientific_name
.form-actions
= f.submit 'Save', :class => 'btn btn-primary'

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

@@ -1,3 +1,3 @@
%h1 Editing scientific_name
- content_for :title, "Edit scientific name"
= render 'form'

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

@@ -1,3 +1,3 @@
%h1 New scientific_name
- content_for :title, "New scientific name"
= render 'form'

3
db/migrate/20130409103549_make_post_subject_non_null.rb Normal file
View File

@@ -0,0 +1,3 @@
class MakePostSubjectNonNull < ActiveRecord::Migration
change_column :posts, :subject, :string, :null => false
end

33
lib/tasks/growstuff.rake
View File

@@ -5,9 +5,40 @@ namespace :growstuff do
task :admin_user => :environment do
member = Member.find(ENV['name']) or raise "Usage: rake growstuff:admin_user name=whoever"
member = Member.find_by_login_name(ENV['name']) or raise "Usage: rake growstuff:admin_user name=whoever (login name is case-sensitive)"
admin = Role.find_or_create_by_name!('admin')
member.roles << admin
end
namespace :oneoff do
desc "One-off tasks needed at various times and kept for posterity"
task :empty_subjects => :environment do
desc "May 2013: replace any empty notification subjects with (no subject)"
# this is inefficient as it checks every Notification, but the
# site is small and there aren't many of them, so it shouldn't matter
# for this one-off script.
Notification.all.each do |n|
n.replace_blank_subject
n.save
end
end
task :empty_garden_names => :environment do
desc "May 2013: replace any empty garden names with Garden"
# this is inefficient as it checks every Garden, but the
# site is small and there aren't many of them, so it shouldn't matter
# for this one-off script.
Garden.all.each do |g|
if g.name.nil? or g.name =~ /^\s*$/
g.name = "Garden"
g.save
end
end
end
end

5
spec/controllers/crops_controller_spec.rb
View File

@@ -5,7 +5,10 @@ describe CropsController do
login_member(:crop_wrangling_member)
def valid_attributes
{ :system_name => "Tomato" }
{
:system_name => "Tomato",
:en_wikipedia_url => 'http://en.wikipedia.org/wiki/Tomato'
}
end
describe "GET index" do

32
spec/controllers/notifications_controller_spec.rb
View File

@@ -7,7 +7,8 @@ describe NotificationsController do
def valid_attributes
{
"recipient_id" => subject.current_member.id,
"sender_id" => FactoryGirl.create(:member).id
"sender_id" => FactoryGirl.create(:member).id,
"subject" => 'test'
}
end
@@ -19,7 +20,8 @@ describe NotificationsController do
def valid_attributes_for_sender
{
"sender_id" => subject.current_member.id,
"recipient_id" => FactoryGirl.create(:member).id
"recipient_id" => FactoryGirl.create(:member).id,
"subject" => 'test'
}
end
@@ -42,6 +44,28 @@ describe NotificationsController do
assigns(:notification).should eq(notification)
end
it "assigns the reply link for a PM" do
notification = FactoryGirl.create(:notification, :recipient_id => subject.current_member.id, :post_id => nil)
subject = "Re: " + notification.subject
get :show, {:id => notification.to_param}
assigns(:reply_link).should_not be_nil
assigns(:reply_link).should eq new_notification_url(
:recipient_id => notification.sender_id,
:subject => subject
)
end
it "assigns the reply link for a post comment" do
notification = FactoryGirl.create(:notification, :recipient_id => subject.current_member.id)
get :show, {:id => notification.to_param}
assigns(:reply_link).should_not be_nil
assigns(:reply_link).should eq new_comment_url(
:post_id => notification.post.id
)
end
it "marks notifications as read" do
notification = FactoryGirl.create(:notification, :recipient_id => subject.current_member.id)
get :show, {:id => notification.to_param}
@@ -95,8 +119,8 @@ describe NotificationsController do
it "redirects to the recipient's profile" do
@recipient = FactoryGirl.create(:member)
post :create, { :notification => { :recipient_id => @recipient.id } }
response.should redirect_to(@recipient)
post :create, { :notification => { :recipient_id => @recipient.id, :subject => 'foo' } }
response.should redirect_to(notifications_path)
end
end

5
spec/controllers/plantings_controller_spec.rb
View File

@@ -161,10 +161,11 @@ describe PlantingsController do
}.to change(Planting, :count).by(-1)
end
it "redirects to the plantings list" do
it "redirects to the garden" do
planting = Planting.create! valid_attributes
garden = planting.garden
delete :destroy, {:id => planting.to_param}
response.should redirect_to(plantings_url)
response.should redirect_to(garden)
end
end

39
spec/controllers/scientific_names_controller_spec.rb
View File

@@ -4,8 +4,12 @@ describe ScientificNamesController do
login_member(:crop_wrangling_member)
before(:each) do
@crop = FactoryGirl.create(:tomato)
end
def valid_attributes
{ :scientific_name => 'Solanum lycopersicum', :crop_id => 1 }
{ :scientific_name => 'Solanum lycopersicum', :crop_id => @crop.id }
end
describe "GET index" do
@@ -29,6 +33,32 @@ describe ScientificNamesController do
get :new, {}
assigns(:scientific_name).should be_a_new(ScientificName)
end
it "assigns crop if specified" do
get :new, { :crop_id => 1 }
assigns(:crop).should be_an_instance_of Crop
end
it "assigns crop if specified" do
end
end
describe "GET edit" do
it "assigns the requested scientific_name as @scientific_name" do
scientific_name = ScientificName.create! valid_attributes
get :edit, {:id => scientific_name.to_param}
assigns(:scientific_name).should eq(scientific_name)
end
end
describe "POST create" do
describe "with valid params" do
it "creates a new ScientificName" do
expect {
post :create, {:scientific_name => valid_attributes}
}.to change(ScientificName, :count).by(1)
end
end
end
describe "GET edit" do
@@ -55,7 +85,7 @@ describe ScientificNamesController do
it "redirects to the created scientific_name" do
post :create, {:scientific_name => valid_attributes}
response.should redirect_to(ScientificName.last)
response.should redirect_to(ScientificName.last.crop)
end
end
@@ -97,7 +127,7 @@ describe ScientificNamesController do
it "redirects to the scientific_name" do
scientific_name = ScientificName.create! valid_attributes
put :update, {:id => scientific_name.to_param, :scientific_name => valid_attributes}
response.should redirect_to(scientific_name)
response.should redirect_to(scientific_name.crop)
end
end
@@ -130,8 +160,9 @@ describe ScientificNamesController do
it "redirects to the scientific_names list" do
scientific_name = ScientificName.create! valid_attributes
crop = scientific_name.crop
delete :destroy, {:id => scientific_name.to_param}
response.should redirect_to(scientific_names_url)
response.should redirect_to(crop)
end
end

5
spec/factories/scientific_name.rb
View File

@@ -1,12 +1,17 @@
FactoryGirl.define do
factory :scientific_name do
association :crop, factory: :crop
scientific_name "Beanus Magicus"
factory :zea_mays do
association :crop, factory: :maize
scientific_name "Zea mays"
end
factory :solanum_lycopersicum do
association :crop, factory: :tomato
scientific_name "Solanum lycopersicum"
end
end
end

34
spec/helpers/notifications_helper_spec.rb Normal file
View File

@@ -0,0 +1,34 @@
require 'spec_helper'
describe NotificationsHelper do
describe "reply_link" do
before(:each) do
@member = FactoryGirl.create(:member)
end
it "replies to PMs with PMs" do
notification = FactoryGirl.create(:notification, :recipient_id => @member.id, :post_id => nil)
subject = "Re: " + notification.subject
link = helper.reply_link(notification)
link.should_not be_nil
link.should eq new_notification_url(
:recipient_id => notification.sender_id,
:subject => subject
)
end
it "replies to post comments with post comments" do
notification = FactoryGirl.create(:notification, :recipient_id => @member.id)
link = helper.reply_link(notification)
link.should_not be_nil
link.should eq new_comment_url(
:post_id => notification.post.id
)
end
end
end

14
spec/helpers/plantings_helper_spec.rb
View File

@@ -1,14 +0,0 @@
require 'spec_helper'
# Specs in this file have access to a helper object that includes
# the PlantingsHelper. For example:
#
# describe PlantingsHelper do
# describe "string concat" do
# it "concats two strings with spaces" do
# helper.concat_strings("this","that").should == "this that"
# end
# end
# end
describe PlantingsHelper do
end

20
spec/models/crop_spec.rb
View File

@@ -27,22 +27,11 @@ describe Crop do
context 'invalid data' do
it 'should not save a crop without a system name' do
@crop = Crop.new
@crop = FactoryGirl.build(:crop, :system_name => nil)
expect { @crop.save }.to raise_error ActiveRecord::StatementInvalid
end
end
context 'random' do
before(:each) do
@crop = FactoryGirl.create(:tomato)
end
it 'should find a random crop' do
@rand_crop = Crop.random
@rand_crop.system_name.should == 'Tomato'
end
end
context 'ordering' do
it "should be sorted case-insensitively" do
uppercase = FactoryGirl.create(:uppercasecrop)
@@ -64,4 +53,11 @@ describe Crop do
FactoryGirl.create(:planting, :crop => @c)
@c.plantings_count.should eq 1
end
it 'validates en_wikipedia_url' do
@crop = FactoryGirl.build(:tomato, :en_wikipedia_url => 'this is not valid')
@crop.should_not be_valid
@crop = FactoryGirl.build(:tomato, :en_wikipedia_url => 'http://en.wikipedia.org/wiki/SomePage')
@crop.should be_valid
end
end

15
spec/models/garden_spec.rb
View File

@@ -14,6 +14,21 @@ describe Garden do
@garden.description.should == "This is a **totally** cool garden"
end
it "doesn't allow a nil name" do
@garden = FactoryGirl.build(:garden, :name => nil)
@garden.should_not be_valid
end
it "doesn't allow a blank name" do
@garden = FactoryGirl.build(:garden, :name => "")
@garden.should_not be_valid
end
it "doesn't allow a name with only spaces" do
@garden = FactoryGirl.build(:garden, :name => " ")
@garden.should_not be_valid
end
it "should have an owner" do
@garden.owner.should be_an_instance_of Member
end

10
spec/models/notification_spec.rb
View File

@@ -48,4 +48,14 @@ describe Notification do
ActionMailer::Base.deliveries.last.to.should == [@notification2.recipient.email]
end
it "replaces missing subjects with (no subject)" do
@notification = FactoryGirl.create(:notification, :subject => nil)
@notification.subject.should == "(no subject)"
end
it "replaces whitespace-only subjects with (no subject)" do
@notification = FactoryGirl.create(:notification, :subject => " ")
@notification.subject.should == "(no subject)"
end
end

15
spec/models/post_spec.rb
View File

@@ -43,6 +43,21 @@ describe Post do
@post.forum.should be_an_instance_of Forum
end
it "doesn't allow a nil subject" do
@post = FactoryGirl.build(:post, :subject => nil)
@post.should_not be_valid
end
it "doesn't allow a blank subject" do
@post = FactoryGirl.build(:post, :subject => "")
@post.should_not be_valid
end
it "doesn't allow a subject with only spaces" do
@post = FactoryGirl.build(:post, :subject => " ")
@post.should_not be_valid
end
context "recent activity" do
before(:each) do
Time.stub(:now => Time.now)

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

@@ -10,7 +10,6 @@ describe "crops/new" do
end
it "renders new crop form" do
render
# Run the generator again with the --webrat flag if you want to use webrat matchers
assert_select "form", :action => crops_path, :method => "post" do
assert_select "input#crop_system_name", :name => "crop[system_name]"
@@ -18,4 +17,8 @@ describe "crops/new" do
end
end
it "shows a link to crop wrangling guidelines" do
assert_select "a[href^=http://wiki.growstuff.org]", "crop wrangling guide"
end
end

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

@@ -54,7 +54,15 @@ describe "crops/show" do
end
it "links to the edit crop form" do
rendered.should contain "Edit"
assert_select "a[href=#{edit_crop_path(@crop)}]", :text => "Edit crop"
end
it "links to the add scientific name form" do
assert_select "a[href^=#{new_scientific_name_path}]", :text => "Add"
end
it "links to the edit scientific name form" do
assert_select "a[href=#{edit_scientific_name_path(@crop.scientific_names.first)}]", :text => "Edit"
end
end

46
spec/views/notifications/index.html.haml_spec.rb
View File

@@ -4,19 +4,45 @@ describe "notifications/index" do
before(:each) do
@member = FactoryGirl.create(:member)
controller.stub(:current_user) { @member }
@notification = FactoryGirl.create(:notification, :sender => @member, :recipient => @member)
assign(:notifications, [ @notification, @notification ])
render
end
it "renders a list of notifications" do
# Run the generator again with the --webrat flag if you want to use webrat matchers
assert_select "table"
assert_select "tr>td", :text => @notification.sender.to_s, :count => 2
assert_select "tr>td", :text => @notification.subject, :count => 2
context "ordinary notifications" do
before(:each) do
@notification = FactoryGirl.create(:notification, :sender => @member,
:recipient => @member)
assign(:notifications, [ @notification, @notification ])
render
end
it "renders a list of notifications" do
assert_select "table"
assert_select "tr>td", :text => @notification.sender.to_s, :count => 2
assert_select "tr>td", :text => @notification.subject, :count => 2
end
it "links to sender's profile" do
assert_select "a", :href => member_path(@notification.sender)
end
end
it "links to sender's profile" do
assert_select "a", :href => member_path(@notification.sender)
context "no subject" do
it "shows (no subject)" do
@notification = FactoryGirl.create(:notification,
:sender => @member, :recipient => @member, :subject => nil)
assign(:notifications, [@notification])
render
rendered.should contain "(no subject)"
end
end
context "whitespace-only subject" do
it "shows (no subject)" do
@notification = FactoryGirl.create(:notification,
:sender => @member, :recipient => @member, :subject => " ")
assign(:notifications, [@notification])
render
rendered.should contain "(no subject)"
end
end
end

17
spec/views/notifications/new.html.haml_spec.rb
View File

@@ -5,7 +5,6 @@ describe "notifications/new" do
@recipient = FactoryGirl.create(:member)
@sender = FactoryGirl.create(:member)
assign(:notification, FactoryGirl.create(:notification, :recipient_id => @recipient.id, :sender_id => @sender.id))
# assign(:forum, Forum.new)
sign_in @sender
controller.stub(:current_user) { @sender}
end
@@ -23,6 +22,22 @@ describe "notifications/new" do
rendered.should contain @recipient.login_name
end
it "puts the recipient in a hidden field" do
render
assert_select "input#notification_recipient_id[type=hidden]", :name => "notification[recipient_id]"
end
it "fills in the subject if provided" do
assign(:subject, 'Foo')
render
assert_select "input#notification_subject", :value => "Foo"
end
it "leaves the subject empty if not provided" do
render
assert_select "input#notification_subject", :value => ""
end
it "Tells you to write your message here" do
render
rendered.should contain "Type your message here"

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

@@ -5,6 +5,7 @@ describe "notifications/show" do
@member = FactoryGirl.create(:member)
@notification = FactoryGirl.create(:notification, :recipient => @member)
assign(:notification, @notification)
@reply_link = assign(:reply_link, new_notification_path)
controller.stub(:current_user) { @member }
render
end
@@ -18,4 +19,8 @@ describe "notifications/show" do
assert_select "a", "Delete"
end
it "includes a reply button" do
assert_select "a[href=#{@reply_link}]", "Reply"
end
end

6
spec/views/notifier/notify.html.haml_spec.rb
View File

@@ -4,6 +4,8 @@ describe 'notifier/notify.html.haml', :type => "view" do
before(:each) do
@notification = FactoryGirl.create(:notification)
@reply_link = "http://example.com"
assign(:reply_link, @reply_link)
render
end
@@ -16,6 +18,10 @@ describe 'notifier/notify.html.haml', :type => "view" do
rendered.should contain @notification.post.subject
end
it 'should include a reply link' do
assert_select "a[href=#{@reply_link}]", :text => /Reply/
end
it 'should contain a link to your inbox' do
assert_select "a[href*=notifications]"
end

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

@@ -15,7 +15,7 @@ describe "scientific_names/edit" do
it "renders the edit scientific_name form" do
assert_select "form", :action => scientific_names_path(@scientific_name), :method => "post" do
assert_select "input#scientific_name_scientific_name", :name => "scientific_name[scientific_name]"
assert_select "input#scientific_name_crop_id", :name => "scientific_name[crop_id]"
assert_select "select#scientific_name_crop_id", :name => "scientific_name[crop_id]"
end
end
end

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

@@ -18,7 +18,7 @@ describe "scientific_names/new" do
# Run the generator again with the --webrat flag if you want to use webrat matchers
assert_select "form", :action => scientific_names_path, :method => "post" do
assert_select "input#scientific_name_scientific_name", :name => "scientific_name[scientific_name]"
assert_select "input#scientific_name_crop_id", :name => "scientific_name[crop_id]"
assert_select "select#scientific_name_crop_id", :name => "scientific_name[crop_id]"
end
end