Permalink
Browse files

Remove the physical description from signup

  • Loading branch information...
1 parent 7796398 commit 05f93bc4c11a8937efa4444648c7d18813cf78db @mike-burns mike-burns committed Nov 11, 2010
@@ -185,7 +185,7 @@ def self.accept_offer(offer)
end
def self.deliver_date(first_user, second_user)
- first_user.tell(%{Nice! You've got a date with #{second_user.name}, '#{second_user.description}'. Say something by texting '#{COMMANDS[:sext]}' and then your message.})
+ first_user.tell(%{Nice! You've got a date with #{second_user.name}. Describe yourself using '#{COMMANDS[:sext]}' followed by a message.})
end
def self.handle_safeword(user)
View
@@ -2,7 +2,7 @@ class User < ActiveRecord::Base
attr_protected :secret_code, :phone_number
validates_presence_of :phone_number
validate :secret_code_matches_or_nil
- validates_presence_of :name, :description, :looking_for_minimum_age, :looking_for_maximum_age,
+ validates_presence_of :name, :looking_for_minimum_age, :looking_for_maximum_age,
:on => :update
validate :at_least_one_gender, :on => :update
validate :at_least_one_desired_gender, :on => :update
@@ -3,7 +3,6 @@
<%= form.inputs do %>
<%= form.input :secret_code_confirmation, :label => 'Secret code from text message' %>
<%= form.input :name, :label => 'First name' %>
- <%= form.input :description, :label => 'How would someone recognize you?' %>
<%= form.input :dob, :start_year => Date.today.year-55, :end_year => Date.today.year-17, :label => "Your birthday" %>
<fieldset>
<legend>Your gender</legend>
@@ -10,7 +10,6 @@ Feature: Accounts
When I fill in my secret code
And I fill in the date of birth with "December 31, 1977"
And I fill in my name as "Mike"
- And I fill in my description as "black shirt, glasses, math book"
And I check my gender as male
And I fill in the minimum age with "21"
And I fill in the maximum age with "34"
@@ -29,7 +28,6 @@ Feature: Accounts
When I fill in my secret code in all caps
And I fill in the date of birth with "December 31, 1977"
And I fill in my name as "Mike"
- And I fill in my description as "black shirt, glasses, math book"
And I check my gender as male
And I fill in the minimum age with "21"
And I fill in the maximum age with "34"
@@ -61,7 +59,6 @@ Feature: Accounts
And I see the error "doesn't match" on the secret code field
And I see the error "can't be blank" on the following user fields:
| name |
- | description |
| looking_for_minimum_age |
| looking_for_maximum_age |
| dob |
@@ -76,7 +73,6 @@ Feature: Accounts
When I fill in my secret code
And I fill in the date of birth with "December 31, 1977"
And I fill in my name as "Jenny"
- And I fill in my description as "black shirt, glasses, math book"
And I check my gender as female
And I fill in the minimum age with "21"
And I fill in the maximum age with "34"
@@ -45,8 +45,8 @@ Feature: The whole app
Then "14444444444" should get a text "Too slow! Would you like to get a date? Reply 'new date'."
Then "15555555555" should get a text "Too slow! Would you like to get a date? Reply 'new date'."
Then "16666666666" should not get a text "Too slow! Would you like to get a date? Reply 'new date'."
- And "11111111111" should get a text "Nice! You've got a date with Emma, 'super hot'. Say something by texting 'say' and then your message."
- And "18004688487" should get a text "Nice! You've got a date with Mike, 'red hair'. Say something by texting 'say' and then your message."
+ And "11111111111" should get a text "Nice! You've got a date with Emma. Describe yourself using 'say' followed by a message."
+ And "18004688487" should get a text "Nice! You've got a date with Mike. Describe yourself using 'say' followed by a message."
Scenario: Existing user texts ok without having a proposed meetup
When "18004688487" texts instalover with "ok"
View
@@ -4,19 +4,18 @@
Factory.define :user do |u|
u.phone_number { Factory.next :phone_number }
- u.secret_code { "supercode" }
- u.name { "Jenny" }
- u.description { "great personality" }
+ u.secret_code "supercode"
+ u.name "Jenny"
end
Factory.define :young_person, :parent => :user do |u|
- u.dob { 21.years.ago }
- u.looking_for_minimum_age { 20 }
- u.looking_for_maximum_age { 22 }
+ u.dob { 21.years.ago }
+ u.looking_for_minimum_age 20
+ u.looking_for_maximum_age 22
end
Factory.define :date_suggestion do |ds|
- ds.text { "Thoughtbot" }
+ ds.text "Thoughtbot"
end
Factory.define :scheduled_meetup, :class => Meetup do |meetup_factory|

0 comments on commit 05f93bc

Please sign in to comment.