+
+
+ City
+
+
+ <%= @group.city %>
+
+
+
<%= organizer_title %>
diff --git a/db/migrate/20180404064557_add_location_to_groups.rb b/db/migrate/20180404064557_add_location_to_groups.rb
new file mode 100644
index 00000000..4e904a6d
--- /dev/null
+++ b/db/migrate/20180404064557_add_location_to_groups.rb
@@ -0,0 +1,6 @@
+class AddLocationToGroups < ActiveRecord::Migration[5.1]
+ def change
+ add_column :groups, :location, :string
+ add_index :groups, :location
+ end
+end
diff --git a/db/migrate/20180404070556_rename_location_to_city_in_groups.rb b/db/migrate/20180404070556_rename_location_to_city_in_groups.rb
new file mode 100644
index 00000000..5a661e95
--- /dev/null
+++ b/db/migrate/20180404070556_rename_location_to_city_in_groups.rb
@@ -0,0 +1,5 @@
+class RenameLocationToCityInGroups < ActiveRecord::Migration[5.1]
+ def change
+ rename_column :groups, :location, :city
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index f44ce3cd..355f9f54 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 20180325115034) do
+ActiveRecord::Schema.define(version: 20180404070556) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@@ -74,6 +74,8 @@
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.bigint "user_id"
+ t.string "city"
+ t.index ["city"], name: "index_groups_on_city"
t.index ["user_id"], name: "index_groups_on_user_id"
end
diff --git a/db/seeds.rb b/db/seeds.rb
index f11c6dd6..005e4215 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -43,13 +43,15 @@ def address
27.times do |n|
puts "Creating user #{n + 1} of 27"
- User.create!(name: Faker::Internet.user_name.capitalize + "#{n}",
- email: Faker::Internet.email,
- password: "password",
+ user_name = Faker::Internet.user_name.capitalize + "#{n}"
+
+ User.create!(name: user_name,
+ email: Faker::Internet.email,
+ password: "password",
password_confirmation: "password",
- confirmed_at: Time.zone.now - 1.day,
- location: Faker::Address.city,
- bio: Faker::BackToTheFuture.quote)
+ confirmed_at: Time.zone.now - 1.day,
+ location: Faker::Address.city,
+ bio: Faker::BackToTheFuture.quote)
end
@@ -73,11 +75,12 @@ def random_users(number = 5)
puts "Creating unhidden group #{index + 1} of 9"
user.owned_groups.create!(
- name: Faker::Lorem.words(2).join(" "),
+ name: Faker::Lorem.words(2).join(" "),
description: Faker::Lorem.paragraph * 2,
- image: File.new("test/fixtures/files/sample.jpeg"),
- private: [true, false].sample,
- hidden: false,
+ city: Faker::Address.city,
+ image: File.new("test/fixtures/files/sample.jpeg"),
+ private: [true, false].sample,
+ hidden: false,
all_members_can_create_events: false
)
end
diff --git a/test/controllers/groups_controller_test.rb b/test/controllers/groups_controller_test.rb
index 1a2b341a..f517023d 100644
--- a/test/controllers/groups_controller_test.rb
+++ b/test/controllers/groups_controller_test.rb
@@ -67,6 +67,7 @@ def group_params
{
name: "Test group",
description: Faker::Lorem.paragraph,
+ city: Faker::Address.city,
image: upload_valid_image,
private: true,
hidden: true,
diff --git a/test/fixtures/groups.yml b/test/fixtures/groups.yml
index ff529721..2637d23d 100644
--- a/test/fixtures/groups.yml
+++ b/test/fixtures/groups.yml
@@ -2,6 +2,7 @@
one:
name: Nike
+ city: Portland, Oregon
description: <%= Faker::Lorem.paragraph %>
image: sample.jpeg
private: true
@@ -11,6 +12,7 @@ one:
two:
name: Private Group
+ city: Portland, Oregon
description: <%= Faker::Lorem.paragraph %>
image: sample.jpeg
private: true
@@ -20,6 +22,7 @@ two:
three:
name: Private & Hidden Group
+ city: Portland, Oregon
description: <%= Faker::Lorem.paragraph %>
image: sample.jpeg
private: true
@@ -29,6 +32,7 @@ three:
four:
name: Private & Hidden Group 2
+ city: Portland, Oregon
description: <%= Faker::Lorem.paragraph %>
image: sample.jpeg
private: true
@@ -38,6 +42,7 @@ four:
strangers_group:
name: Strangers Group
+ city: Portland, Oregon
description: <%= Faker::Lorem.paragraph %>
image: sample.jpeg
private: true
@@ -47,6 +52,7 @@ strangers_group:
public:
name: Public Group
+ city: Portland, Oregon
description: <%= Faker::Lorem.paragraph %>
image: sample.jpeg
private: false
diff --git a/test/integration/groups_creation_test.rb b/test/integration/groups_creation_test.rb
index f1820f93..1b73ad47 100644
--- a/test/integration/groups_creation_test.rb
+++ b/test/integration/groups_creation_test.rb
@@ -19,6 +19,7 @@ class GroupsCreationTest < ActionDispatch::IntegrationTest
end
fill_in "Name", with: "Test group"
+ fill_in "City", with: Faker::Address.city
fill_in_description(Faker::Lorem.paragraph)
attach_valid_image
diff --git a/test/integration/groups_edit_test.rb b/test/integration/groups_edit_test.rb
index c5ddd748..2f000d0b 100644
--- a/test/integration/groups_edit_test.rb
+++ b/test/integration/groups_edit_test.rb
@@ -12,6 +12,7 @@ class GroupsEditTest < ActionDispatch::IntegrationTest
visit edit_group_path(group)
fill_in "Name", with: "Test group"
+ fill_in "City", with: Faker::Address.city
fill_in_description(Faker::Lorem.paragraph)
attach_valid_image
diff --git a/test/integration/groups_show_test.rb b/test/integration/groups_show_test.rb
index c2d795c7..2a5d5cb1 100644
--- a/test/integration/groups_show_test.rb
+++ b/test/integration/groups_show_test.rb
@@ -130,6 +130,7 @@ def add_to_members(*users)
def assert_group_info_and_image
assert page.has_css? ".group-image"
assert page.has_content? @group.name
+ assert page.has_content? @group.city
assert page.has_content? @group.description
end
diff --git a/test/models/group_test.rb b/test/models/group_test.rb
index 5449bb27..2df083c2 100644
--- a/test/models/group_test.rb
+++ b/test/models/group_test.rb
@@ -5,6 +5,11 @@ class GroupTest < ActiveSupport::TestCase
assert fake_group.valid?
end
+ test "is invalid without city" do
+ group = fake_group(city: "")
+ refute group.valid?
+ end
+
test "is invalid without name" do
group = fake_group(name: "")
refute group.valid?
@@ -66,6 +71,7 @@ def fake_group(params = {})
@fake_group ||= Group.new(
owner: params[:owner] || users(:phil),
name: params[:name] || "Test group",
+ city: params[:city] || Faker::Address.city,
description: params[:description] || Faker::Lorem.paragraph,
image: params[:image] || valid_image,
private: params[:private] || true,