From 4b63aee060a044d44ede243d09169d3cd62e5fe2 Mon Sep 17 00:00:00 2001 From: Askarbek Karasaev Date: Thu, 17 Sep 2015 16:22:54 +0900 Subject: [PATCH 1/3] Ingoring IntelliJ related stuff --- .gitignore | 5 +++++ spec/requests/end_to_end_flow_spec.rb | 2 ++ 2 files changed, 7 insertions(+) diff --git a/.gitignore b/.gitignore index d8e4267..b7b1c3b 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,8 @@ spec/examples.txt /docs .DS_Store + +# Ignoring IntelliJ related stuff +.idea +*.iml + diff --git a/spec/requests/end_to_end_flow_spec.rb b/spec/requests/end_to_end_flow_spec.rb index f340d16..280bf5d 100644 --- a/spec/requests/end_to_end_flow_spec.rb +++ b/spec/requests/end_to_end_flow_spec.rb @@ -233,6 +233,8 @@ ) wager_id = JSON.parse(response.body)["data"]["id"] + expect(wager_id).not_to be_nil + end end From ec5fdfc4092ad3bc512600116c54d8e4bfdc7eb5 Mon Sep 17 00:00:00 2001 From: Askarbek Karasaev Date: Fri, 18 Sep 2015 02:26:55 +0900 Subject: [PATCH 2/3] Adding birth_date field --- db/migrate/20150917164853_add_birth_date_to_users.rb | 5 +++++ db/schema.rb | 3 ++- spec/acceptance/users_spec.rb | 4 ++++ spec/models/user_spec.rb | 6 ++++++ 4 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20150917164853_add_birth_date_to_users.rb diff --git a/db/migrate/20150917164853_add_birth_date_to_users.rb b/db/migrate/20150917164853_add_birth_date_to_users.rb new file mode 100644 index 0000000..d1036d4 --- /dev/null +++ b/db/migrate/20150917164853_add_birth_date_to_users.rb @@ -0,0 +1,5 @@ +class AddBirthDateToUsers < ActiveRecord::Migration + def change + add_column :users, :birth_date, :date + end +end diff --git a/db/schema.rb b/db/schema.rb index 885aee4..a44f1d3 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20150914233717) do +ActiveRecord::Schema.define(version: 20150917164853) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -210,6 +210,7 @@ t.datetime "created_at", null: false t.datetime "updated_at", null: false t.boolean "pit_boss", default: false, null: false + t.date "birth_date" end create_table "wagers", force: :cascade do |t| diff --git a/spec/acceptance/users_spec.rb b/spec/acceptance/users_spec.rb index 1886c12..6888ca5 100644 --- a/spec/acceptance/users_spec.rb +++ b/spec/acceptance/users_spec.rb @@ -28,6 +28,10 @@ "drowssap" end + let 'birth_date' do + Date.new(1975,3,5) + end + example_request "POST /v1/users" do expect(status).to eq 201 parsed = JSON.parse(response_body) diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index b1049d7..edabbea 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -10,6 +10,12 @@ expect(subject.errors[:username]).to include "can't be blank" end + it 'has a birth date attribute' do + birth_date = Date.new(1975,03,05) + subject.birth_date = birth_date + expect(subject.birth_date).to eq birth_date + end + it "has the pit_boss attribute" do subject.pit_boss = true expect(subject).to be_pit_boss From 37cbe01c6fd5503ad1edf8d5a07804903fdc897b Mon Sep 17 00:00:00 2001 From: Askarbek Karasaev Date: Fri, 18 Sep 2015 03:27:19 +0900 Subject: [PATCH 3/3] Adding birth_date attribute acceptance test not working yet --- app/models/user.rb | 2 ++ spec/acceptance/users_spec.rb | 4 ++++ spec/factories/users.rb | 3 ++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/app/models/user.rb b/app/models/user.rb index 53d7efb..a474614 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -3,5 +3,7 @@ class User < ActiveRecord::Base validates :username, presence: true + validates :birth_date, presence: true + has_many :players end diff --git a/spec/acceptance/users_spec.rb b/spec/acceptance/users_spec.rb index 6888ca5..6fc9f22 100644 --- a/spec/acceptance/users_spec.rb +++ b/spec/acceptance/users_spec.rb @@ -28,6 +28,10 @@ "drowssap" end + parameter 'birth_date', <<-DESC, required: true, scope: :attributes + Date of birth. + DESC + let 'birth_date' do Date.new(1975,3,5) end diff --git a/spec/factories/users.rb b/spec/factories/users.rb index b0b3995..2882f81 100644 --- a/spec/factories/users.rb +++ b/spec/factories/users.rb @@ -1,6 +1,7 @@ FactoryGirl.define do factory :user do username "sean" - password "drowssap" + password "drowssa" + birth_date Date.new(1975,3,5) end end