<%= @happy_count %>
@@ -48,16 +52,27 @@
<% if @markers %>
-
+
<% end %>
<% if @user == current_user %>
<%= link_to "Edit Profile", edit_user_registration_path, class: "mb-5 btn nav-link bottom-icons" %>
<%= button_to "Logout", destroy_user_session_path, method: :delete, class: "btn shadow mt-5" %>
+ <% else %>
+ <% friendship = current_user.friendships.accepted.find_by(friend_id: @user.id) %>
+ <% if friendship.present? %>
+
+ <%= button_to "Remove Friend", friendship_path(friendship), method: :delete,
+ class: "btn shadow",
+ data: { confirm: "Are you sure you want to remove #{@user.first_name} as a friend?" } %>
+
+ <% end %>
<% end %>
diff --git a/config/environments/development.rb b/config/environments/development.rb
index d4aa1308..530159ae 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -74,8 +74,11 @@
# Uncomment if you wish to allow Action Cable access from any origin.
# config.action_cable.disable_request_forgery_protection = true
- # Local Tunnel (Allow requests)
- config.hosts.clear
+ # Allow ngrok and local connections
+ # Allows any ngrok subdomain for development
+ config.hosts << 'localhost'
+ config.hosts << /[a-z0-9-]+\.ngrok-free\.app/
+ config.hosts << /[a-z0-9-]+\.ngrok\.io/
# Use an explicit host for mailer URLs.
Rails.application.routes.default_url_options[:host] = 'localhost:3000'
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 5964eb9c..94fabe2e 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -22,3 +22,19 @@ de:
password:
length: "muss zwischen 12 und 30 Zeichen lang sein"
invalid: "muss mindestens einen Großbuchstaben, einen Kleinbuchstaben, eine Zahl und ein Sonderzeichen enthalten und darf keine Leerzeichen enthalten"
+
+ friendships:
+ created: "Freundschaftsanfrage gesendet. 👻"
+ create_failed: "Freundschaftsanfrage konnte nicht gesendet werden. 🤔"
+ accepted: "Freundschaftsanfrage akzeptiert. 🫱🏻🫲🏾"
+ accept_failed: "Freundschaftsanfrage konnte nicht akzeptiert werden. 🙈"
+ destroyed: "Freundschaft entfernt. 😭"
+
+ friends:
+ page_title: "Freundinnen hinzufügen oder suchen"
+ search_placeholder: "Nach Namen, Benutzernamen oder E-Mails suchen"
+ my_friends: "Meine Freundinnen"
+ pending_sent: "Gesendete Anfragen"
+ pending_received: "Empfangene Freundschaftsanfragen"
+ users: "Benutzerinnen"
+ no_results: "Keine Benutzerinnen gefunden für"
diff --git a/config/locales/en.yml b/config/locales/en.yml
index e1667382..e51a3e45 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -22,3 +22,19 @@ en:
password:
length: "must be between 12 and 30 characters long"
invalid: "must include at least one uppercase, one lowercase, one number, and one special character, and cannot contain spaces"
+
+ friendships:
+ created: "Friend request sent. 👻"
+ create_failed: "Unable to send friend request. 🤔"
+ accepted: "Friend request accepted. 🫱🏻🫲🏾"
+ accept_failed: "Unable to accept friend request. 🙈"
+ destroyed: "Friendship removed. 😭"
+
+ friends:
+ page_title: "Add or Search Friends"
+ search_placeholder: "Search for names, usernames, or emails"
+ my_friends: "My Friends"
+ pending_sent: "Pending Requests You Sent"
+ pending_received: "Friend Requests You Received"
+ users: "Users"
+ no_results: "No users found matching"
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
new file mode 100644
index 00000000..f6fa9bd1
--- /dev/null
+++ b/config/locales/sv.yml
@@ -0,0 +1,40 @@
+sv:
+ simple_form:
+ placeholders:
+ happy_thing:
+ title: Vad fick dig att le idag?
+ labels:
+ happy_thing:
+ title: Namn
+
+ helpers:
+ submit:
+ happy_thing:
+ create: Skapa glad sak
+ update: Uppdatera glad sak
+
+ errors:
+ models:
+ user:
+ first_name:
+ length: "måste vara mellan 3 och 30 tecken lång"
+ invalid: "kan inte innehålla länkar eller skript"
+ password:
+ length: "måste vara mellan 12 och 30 tecken lång"
+ invalid: "måste innehålla minst en stor bokstav, en liten bokstav, en siffra och ett specialtecken, och kan inte innehålla mellanslag"
+
+ friendships:
+ created: "Vänförfrågan skickad. 👻"
+ create_failed: "Kunde inte skicka vänförfrågan. 🤔"
+ accepted: "Vänförfrågan accepterad. 🫱🏻🫲🏾"
+ accept_failed: "Kunde inte acceptera vänförfrågan. 🙈"
+ destroyed: "Vänskap borttagen. 😭"
+
+ friends:
+ page_title: "Lägg till eller sök vänner"
+ search_placeholder: "Sök efter namn, användarnamn eller e-post"
+ my_friends: "Mina vänner"
+ pending_sent: "Skickade förfrågningar"
+ pending_received: "Mottagna vänförfrågningar"
+ users: "Användare"
+ no_results: "Inga användare hittades för"
diff --git a/db/migrate/20251026140700_remove_duplicate_friendships_and_add_unique_index.rb b/db/migrate/20251026140700_remove_duplicate_friendships_and_add_unique_index.rb
new file mode 100644
index 00000000..44c58435
--- /dev/null
+++ b/db/migrate/20251026140700_remove_duplicate_friendships_and_add_unique_index.rb
@@ -0,0 +1,23 @@
+class RemoveDuplicateFriendshipsAndAddUniqueIndex < ActiveRecord::Migration[8.0]
+ def up
+ # Remove bidirectional duplicates - keep only one direction per friendship
+ # For each pair of users, keep the friendship with the lower ID
+ execute <<-SQL
+ DELETE FROM friendships
+ WHERE id IN (
+ SELECT f2.id
+ FROM friendships f1
+ INNER JOIN friendships f2 ON f1.user_id = f2.friend_id AND f1.friend_id = f2.user_id
+ WHERE f1.id < f2.id
+ )
+ SQL
+
+ # Note: Unique index already exists in schema
+ # index_friendships_on_user_id_and_friend_id is already present
+ end
+
+ def down
+ # Duplicates were removed, can't be restored
+ # Index already existed, won't be removed
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 46377015..8d911c37 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
# This file is auto-generated from the current state of the database. Instead
# of editing this file, please use the migrations feature of Active Record to
# incrementally modify your database, and then regenerate this schema definition.
@@ -12,157 +10,170 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema[7.0].define(version: 2025_06_18_210827) do
+ActiveRecord::Schema[8.0].define(version: 2025_10_26_140700) do
# These are extensions that must be enabled in order to support this database
- enable_extension 'plpgsql'
+ enable_extension "pg_catalog.plpgsql"
+
+ create_table "active_storage_attachments", force: :cascade do |t|
+ t.string "name", null: false
+ t.string "record_type", null: false
+ t.bigint "record_id", null: false
+ t.bigint "blob_id", null: false
+ t.datetime "created_at", null: false
+ t.index ["blob_id"], name: "index_active_storage_attachments_on_blob_id"
+ t.index ["record_type", "record_id", "name", "blob_id"], name: "index_active_storage_attachments_uniqueness", unique: true
+ end
- create_table 'active_storage_attachments', force: :cascade do |t|
- t.string 'name', null: false
- t.string 'record_type', null: false
- t.bigint 'record_id', null: false
- t.bigint 'blob_id', null: false
- t.datetime 'created_at', null: false
- t.index ['blob_id'], name: 'index_active_storage_attachments_on_blob_id'
- t.index %w[record_type record_id name blob_id], name: 'index_active_storage_attachments_uniqueness',
- unique: true
+ create_table "active_storage_blobs", force: :cascade do |t|
+ t.string "key", null: false
+ t.string "filename", null: false
+ t.string "content_type"
+ t.text "metadata"
+ t.string "service_name", null: false
+ t.bigint "byte_size", null: false
+ t.string "checksum"
+ t.datetime "created_at", null: false
+ t.index ["key"], name: "index_active_storage_blobs_on_key", unique: true
end
- create_table 'active_storage_blobs', force: :cascade do |t|
- t.string 'key', null: false
- t.string 'filename', null: false
- t.string 'content_type'
- t.text 'metadata'
- t.string 'service_name', null: false
- t.bigint 'byte_size', null: false
- t.string 'checksum'
- t.datetime 'created_at', null: false
- t.index ['key'], name: 'index_active_storage_blobs_on_key', unique: true
+ create_table "active_storage_variant_records", force: :cascade do |t|
+ t.bigint "blob_id", null: false
+ t.string "variation_digest", null: false
+ t.index ["blob_id", "variation_digest"], name: "index_active_storage_variant_records_uniqueness", unique: true
end
- create_table 'active_storage_variant_records', force: :cascade do |t|
- t.bigint 'blob_id', null: false
- t.string 'variation_digest', null: false
- t.index %w[blob_id variation_digest], name: 'index_active_storage_variant_records_uniqueness', unique: true
+ create_table "categories", force: :cascade do |t|
+ t.string "name"
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
end
- create_table 'categories', force: :cascade do |t|
- t.string 'name'
- t.datetime 'created_at', null: false
- t.datetime 'updated_at', null: false
+ create_table "comments", force: :cascade do |t|
+ t.bigint "user_id", null: false
+ t.bigint "happy_thing_id", null: false
+ t.text "content"
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ t.index ["happy_thing_id"], name: "index_comments_on_happy_thing_id"
+ t.index ["user_id"], name: "index_comments_on_user_id"
end
- create_table 'comments', force: :cascade do |t|
- t.bigint 'user_id', null: false
- t.bigint 'happy_thing_id', null: false
- t.text 'content'
- t.datetime 'created_at', null: false
- t.datetime 'updated_at', null: false
- t.index ['happy_thing_id'], name: 'index_comments_on_happy_thing_id'
- t.index ['user_id'], name: 'index_comments_on_user_id'
+ create_table "daily_happy_email_deliveries", force: :cascade do |t|
+ t.bigint "user_id", null: false
+ t.bigint "recipient_id", null: false
+ t.datetime "delivered_at", null: false
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ t.index ["recipient_id"], name: "index_daily_happy_email_deliveries_on_recipient_id"
+ t.index ["user_id"], name: "index_daily_happy_email_deliveries_on_user_id"
end
- create_table 'friendships', force: :cascade do |t|
- t.bigint 'user_id'
- t.bigint 'friend_id'
- t.boolean 'accepted', default: false
- t.datetime 'created_at', null: false
- t.datetime 'updated_at', null: false
- t.index ['friend_id'], name: 'index_friendships_on_friend_id'
- t.index %w[user_id friend_id], name: 'index_friendships_on_user_id_and_friend_id', unique: true
- t.index ['user_id'], name: 'index_friendships_on_user_id'
+ create_table "friendships", force: :cascade do |t|
+ t.bigint "user_id"
+ t.bigint "friend_id"
+ t.boolean "accepted", default: false
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ t.index ["friend_id"], name: "index_friendships_on_friend_id"
+ t.index ["user_id", "friend_id"], name: "index_friendships_on_user_id_and_friend_id", unique: true
+ t.index ["user_id"], name: "index_friendships_on_user_id"
end
- create_table 'group_memberships', force: :cascade do |t|
- t.bigint 'group_id', null: false
- t.bigint 'friend_id', null: false
- t.datetime 'created_at', null: false
- t.datetime 'updated_at', null: false
- t.index ['friend_id'], name: 'index_group_memberships_on_friend_id'
- t.index ['group_id'], name: 'index_group_memberships_on_group_id'
+ create_table "group_memberships", force: :cascade do |t|
+ t.bigint "group_id", null: false
+ t.bigint "friend_id", null: false
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ t.index ["friend_id"], name: "index_group_memberships_on_friend_id"
+ t.index ["group_id"], name: "index_group_memberships_on_group_id"
end
- create_table 'groups', force: :cascade do |t|
- t.string 'name'
- t.bigint 'user_id', null: false
- t.datetime 'created_at', null: false
- t.datetime 'updated_at', null: false
- t.index ['user_id'], name: 'index_groups_on_user_id'
+ create_table "groups", force: :cascade do |t|
+ t.string "name"
+ t.bigint "user_id", null: false
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ t.index ["user_id"], name: "index_groups_on_user_id"
end
- create_table 'happy_thing_group_shares', force: :cascade do |t|
- t.bigint 'happy_thing_id', null: false
- t.bigint 'group_id', null: false
- t.datetime 'created_at', null: false
- t.datetime 'updated_at', null: false
- t.index ['group_id'], name: 'index_happy_thing_group_shares_on_group_id'
- t.index ['happy_thing_id'], name: 'index_happy_thing_group_shares_on_happy_thing_id'
+ create_table "happy_thing_group_shares", force: :cascade do |t|
+ t.bigint "happy_thing_id", null: false
+ t.bigint "group_id", null: false
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ t.index ["group_id"], name: "index_happy_thing_group_shares_on_group_id"
+ t.index ["happy_thing_id"], name: "index_happy_thing_group_shares_on_happy_thing_id"
end
- create_table 'happy_thing_user_shares', force: :cascade do |t|
- t.bigint 'happy_thing_id', null: false
- t.bigint 'friend_id', null: false
- t.datetime 'created_at', null: false
- t.datetime 'updated_at', null: false
- t.index ['friend_id'], name: 'index_happy_thing_user_shares_on_friend_id'
- t.index ['happy_thing_id'], name: 'index_happy_thing_user_shares_on_happy_thing_id'
+ create_table "happy_thing_user_shares", force: :cascade do |t|
+ t.bigint "happy_thing_id", null: false
+ t.bigint "friend_id", null: false
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ t.index ["friend_id"], name: "index_happy_thing_user_shares_on_friend_id"
+ t.index ["happy_thing_id"], name: "index_happy_thing_user_shares_on_happy_thing_id"
end
- create_table 'happy_things', force: :cascade do |t|
- t.string 'title', null: false
- t.text 'body'
- t.integer 'status'
- t.bigint 'user_id', null: false
- t.datetime 'created_at', null: false
- t.datetime 'updated_at', null: false
- t.datetime 'start_time'
- t.string 'place'
- t.float 'latitude'
- t.float 'longitude'
- t.bigint 'category_id'
- t.boolean 'share_location'
- t.index ['category_id'], name: 'index_happy_things_on_category_id'
- t.index ['user_id'], name: 'index_happy_things_on_user_id'
+ create_table "happy_things", force: :cascade do |t|
+ t.string "title", null: false
+ t.text "body"
+ t.integer "status"
+ t.bigint "user_id", null: false
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ t.datetime "start_time"
+ t.string "place"
+ t.float "latitude"
+ t.float "longitude"
+ t.bigint "category_id"
+ t.boolean "share_location"
+ t.string "visibility", default: "public"
+ t.index ["category_id"], name: "index_happy_things_on_category_id"
+ t.index ["user_id"], name: "index_happy_things_on_user_id"
+ t.index ["visibility"], name: "index_happy_things_on_visibility"
end
- create_table 'users', force: :cascade do |t|
- t.string 'first_name'
- t.string 'last_name'
- t.string 'email', default: '', null: false
- t.string 'encrypted_password', default: '', null: false
- t.string 'reset_password_token'
- t.datetime 'reset_password_sent_at'
- t.datetime 'remember_created_at'
- t.integer 'sign_in_count', default: 0, null: false
- t.datetime 'created_at', null: false
- t.datetime 'updated_at', null: false
- t.string 'emoji'
- t.boolean 'email_opt_in', default: false
- t.boolean 'location_opt_in', default: false
- t.string 'username'
- t.string 'confirmation_token'
- t.datetime 'confirmed_at'
- t.datetime 'confirmation_sent_at'
- t.string 'unconfirmed_email'
- t.string 'provider'
- t.string 'uid'
- t.index ['confirmation_token'], name: 'index_users_on_confirmation_token', unique: true
- t.index ['email'], name: 'index_users_on_email', unique: true
- t.index ['reset_password_token'], name: 'index_users_on_reset_password_token', unique: true
+ create_table "users", force: :cascade do |t|
+ t.string "first_name"
+ t.string "last_name"
+ t.string "email", default: "", null: false
+ t.string "encrypted_password", default: "", null: false
+ t.string "reset_password_token"
+ t.datetime "reset_password_sent_at"
+ t.datetime "remember_created_at"
+ t.integer "sign_in_count", default: 0, null: false
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ t.string "emoji"
+ t.boolean "email_opt_in", default: false
+ t.boolean "location_opt_in", default: false
+ t.string "username"
+ t.string "confirmation_token"
+ t.datetime "confirmed_at"
+ t.datetime "confirmation_sent_at"
+ t.string "unconfirmed_email"
+ t.string "provider"
+ t.string "uid"
+ t.index ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true
+ t.index ["email"], name: "index_users_on_email", unique: true
+ t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
end
- add_foreign_key 'active_storage_attachments', 'active_storage_blobs', column: 'blob_id'
- add_foreign_key 'active_storage_variant_records', 'active_storage_blobs', column: 'blob_id'
- add_foreign_key 'comments', 'happy_things'
- add_foreign_key 'comments', 'users'
- add_foreign_key 'friendships', 'users'
- add_foreign_key 'friendships', 'users', column: 'friend_id'
- add_foreign_key 'group_memberships', 'groups'
- add_foreign_key 'group_memberships', 'users', column: 'friend_id'
- add_foreign_key 'groups', 'users'
- add_foreign_key 'happy_thing_group_shares', 'groups'
- add_foreign_key 'happy_thing_group_shares', 'happy_things'
- add_foreign_key 'happy_thing_user_shares', 'happy_things'
- add_foreign_key 'happy_thing_user_shares', 'users', column: 'friend_id'
- add_foreign_key 'happy_things', 'categories'
- add_foreign_key 'happy_things', 'users'
+ add_foreign_key "active_storage_attachments", "active_storage_blobs", column: "blob_id"
+ add_foreign_key "active_storage_variant_records", "active_storage_blobs", column: "blob_id"
+ add_foreign_key "comments", "happy_things"
+ add_foreign_key "comments", "users"
+ add_foreign_key "daily_happy_email_deliveries", "users"
+ add_foreign_key "daily_happy_email_deliveries", "users", column: "recipient_id"
+ add_foreign_key "friendships", "users"
+ add_foreign_key "friendships", "users", column: "friend_id"
+ add_foreign_key "group_memberships", "groups"
+ add_foreign_key "group_memberships", "users", column: "friend_id"
+ add_foreign_key "groups", "users"
+ add_foreign_key "happy_thing_group_shares", "groups"
+ add_foreign_key "happy_thing_group_shares", "happy_things"
+ add_foreign_key "happy_thing_user_shares", "happy_things"
+ add_foreign_key "happy_thing_user_shares", "users", column: "friend_id"
+ add_foreign_key "happy_things", "categories"
+ add_foreign_key "happy_things", "users"
end
diff --git a/db/seeds.rb b/db/seeds.rb
index f55ab61c..bc2316ee 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -50,18 +50,13 @@ def u(name)
# --- Friendships ---
Friendship.create!([
{ user: u('Emmsiboom'), friend: u('Joshy'), accepted: true },
- { user: u('Joshy'), friend: u('Emmsiboom'), accepted: true },
{ user: u('Emmsiboom'), friend: u('Hansibaby'), accepted: true },
- { user: u('Hansibaby'), friend: u('Emmsiboom'), accepted: true },
{ user: u('Emmsiboom'), friend: u('Juanfairy'), accepted: true },
- { user: u('Juanfairy'), friend: u('Emmsiboom'), accepted: true },
{ user: u('Mäx'), friend: u('Emmsiboom'), accepted: false },
{ user: u('Santimaus'), friend: u('Emmsiboom'), accepted: false },
{ user: u('Emmsiboom'), friend: u('Florenke'), accepted: false },
{ user: u('Joshy'), friend: u('Hansibaby'), accepted: true },
- { user: u('Hansibaby'), friend: u('Joshy'), accepted: true },
{ user: u('Juanfairy'), friend: u('Santimaus'), accepted: true },
- { user: u('Santimaus'), friend: u('Juanfairy'), accepted: true },
{ user: u('Mäx'), friend: u('Joshy'), accepted: false },
{ user: u('Juanfairy'), friend: u('Mäx'), accepted: false }
])
diff --git a/lib/tasks/annotate_rb.rake b/lib/tasks/annotate_rb.rake
new file mode 100644
index 00000000..1ad0ec39
--- /dev/null
+++ b/lib/tasks/annotate_rb.rake
@@ -0,0 +1,8 @@
+# This rake task was added by annotate_rb gem.
+
+# Can set `ANNOTATERB_SKIP_ON_DB_TASKS` to be anything to skip this
+if Rails.env.development? && ENV["ANNOTATERB_SKIP_ON_DB_TASKS"].nil?
+ require "annotate_rb"
+
+ AnnotateRb::Core.load_rake_tasks
+end
diff --git a/lib/tasks/pwa_icons.rake b/lib/tasks/pwa_icons.rake
new file mode 100644
index 00000000..b9006c61
--- /dev/null
+++ b/lib/tasks/pwa_icons.rake
@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+# rubocop:disable Metrics/BlockLength
+namespace :assets do
+ desc 'Generate PWA icons in multiple sizes from source image'
+ task copy_icons: :environment do
+ require 'fileutils'
+ require 'mini_magick'
+
+ source = Rails.root.join('app/assets/images/five.png')
+
+ # Warn if source file doesn't exist
+ unless File.exist?(source)
+ puts "❌ Source image not found: #{source}"
+ puts 'Please ensure app/assets/images/five.png exists and is at least 512x512px'
+ exit 1
+ end
+
+ # Check source image dimensions
+ image = MiniMagick::Image.open(source)
+ if image.width < 512 || image.height < 512
+ puts "⚠️ Warning: Source image is #{image.width}x#{image.height}. Recommended minimum is 512x512px"
+ end
+
+ # Define icon sizes: [destination_path, size]
+ icons = [
+ [Rails.root.join('public/apple-touch-icon.png'), 180],
+ [Rails.root.join('public/apple-touch-icon-precomposed.png'), 180],
+ [Rails.root.join('public/icon-192.png'), 192],
+ [Rails.root.join('public/icon-512.png'), 512]
+ ]
+
+ icons.each do |dest, size|
+ resized_image = MiniMagick::Image.open(source)
+ resized_image.resize "#{size}x#{size}"
+ resized_image.write(dest)
+ puts "✅ Generated #{dest.basename} (#{size}x#{size})"
+ end
+
+ puts "\n🎉 PWA icons updated successfully!"
+ end
+end
+# rubocop:enable Metrics/BlockLength
diff --git a/public/manifest.json b/public/manifest.json
new file mode 100644
index 00000000..cdf83fe7
--- /dev/null
+++ b/public/manifest.json
@@ -0,0 +1,30 @@
+{
+ "name": "5 Things",
+ "short_name": "5 Things",
+ "description": "Track your daily happy moments",
+ "start_url": "/",
+ "display": "standalone",
+ "theme_color": "#FAF9F6",
+ "background_color": "#FAF9F6",
+ "orientation": "portrait",
+ "icons": [
+ {
+ "src": "/apple-touch-icon.png",
+ "sizes": "180x180",
+ "type": "image/png",
+ "purpose": "any maskable"
+ },
+ {
+ "src": "/icon-192.png",
+ "sizes": "192x192",
+ "type": "image/png",
+ "purpose": "any maskable"
+ },
+ {
+ "src": "/icon-512.png",
+ "sizes": "512x512",
+ "type": "image/png",
+ "purpose": "any maskable"
+ }
+ ]
+}
diff --git a/spec/factories/categories.rb b/spec/factories/categories.rb
index 29be2cda..a52c3f6a 100644
--- a/spec/factories/categories.rb
+++ b/spec/factories/categories.rb
@@ -1,5 +1,14 @@
# frozen_string_literal: true
+# == Schema Information
+#
+# Table name: categories
+#
+# id :bigint not null, primary key
+# name :string
+# created_at :datetime not null
+# updated_at :datetime not null
+#
FactoryBot.define do
factory :category do
name { 'General' }
diff --git a/spec/factories/comments.rb b/spec/factories/comments.rb
index 1c8ef609..4b7d3ee5 100644
--- a/spec/factories/comments.rb
+++ b/spec/factories/comments.rb
@@ -1,5 +1,26 @@
# frozen_string_literal: true
+# == Schema Information
+#
+# Table name: comments
+#
+# id :bigint not null, primary key
+# content :text
+# created_at :datetime not null
+# updated_at :datetime not null
+# happy_thing_id :bigint not null
+# user_id :bigint not null
+#
+# Indexes
+#
+# index_comments_on_happy_thing_id (happy_thing_id)
+# index_comments_on_user_id (user_id)
+#
+# Foreign Keys
+#
+# fk_rails_... (happy_thing_id => happy_things.id)
+# fk_rails_... (user_id => users.id)
+#
FactoryBot.define do
factory :comment do
content { Faker::Lorem.sentence }
diff --git a/spec/factories/friendships.rb b/spec/factories/friendships.rb
index 2298ddee..a5454e2c 100644
--- a/spec/factories/friendships.rb
+++ b/spec/factories/friendships.rb
@@ -1,5 +1,27 @@
# frozen_string_literal: true
+# == Schema Information
+#
+# Table name: friendships
+#
+# id :bigint not null, primary key
+# accepted :boolean default(FALSE)
+# created_at :datetime not null
+# updated_at :datetime not null
+# friend_id :bigint
+# user_id :bigint
+#
+# Indexes
+#
+# index_friendships_on_friend_id (friend_id)
+# index_friendships_on_user_id (user_id)
+# index_friendships_on_user_id_and_friend_id (user_id,friend_id) UNIQUE
+#
+# Foreign Keys
+#
+# fk_rails_... (friend_id => users.id)
+# fk_rails_... (user_id => users.id)
+#
FactoryBot.define do
factory :friendship do
user
diff --git a/spec/factories/group_memberships.rb b/spec/factories/group_memberships.rb
index be771bb1..fcb1bd1e 100644
--- a/spec/factories/group_memberships.rb
+++ b/spec/factories/group_memberships.rb
@@ -1,5 +1,25 @@
# frozen_string_literal: true
+# == Schema Information
+#
+# Table name: group_memberships
+#
+# id :bigint not null, primary key
+# created_at :datetime not null
+# updated_at :datetime not null
+# friend_id :bigint not null
+# group_id :bigint not null
+#
+# Indexes
+#
+# index_group_memberships_on_friend_id (friend_id)
+# index_group_memberships_on_group_id (group_id)
+#
+# Foreign Keys
+#
+# fk_rails_... (friend_id => users.id)
+# fk_rails_... (group_id => groups.id)
+#
FactoryBot.define do
factory :group_membership do
association :group
diff --git a/spec/factories/groups.rb b/spec/factories/groups.rb
index 7a4e2afa..f86231f5 100644
--- a/spec/factories/groups.rb
+++ b/spec/factories/groups.rb
@@ -1,5 +1,23 @@
# frozen_string_literal: true
+# == Schema Information
+#
+# Table name: groups
+#
+# id :bigint not null, primary key
+# name :string
+# created_at :datetime not null
+# updated_at :datetime not null
+# user_id :bigint not null
+#
+# Indexes
+#
+# index_groups_on_user_id (user_id)
+#
+# Foreign Keys
+#
+# fk_rails_... (user_id => users.id)
+#
FactoryBot.define do
factory :group do
name { 'Favorites' }
diff --git a/spec/factories/happy_thing_group_shares.rb b/spec/factories/happy_thing_group_shares.rb
index 7c4b1b1b..5915ff04 100644
--- a/spec/factories/happy_thing_group_shares.rb
+++ b/spec/factories/happy_thing_group_shares.rb
@@ -1,5 +1,25 @@
# frozen_string_literal: true
+# == Schema Information
+#
+# Table name: happy_thing_group_shares
+#
+# id :bigint not null, primary key
+# created_at :datetime not null
+# updated_at :datetime not null
+# group_id :bigint not null
+# happy_thing_id :bigint not null
+#
+# Indexes
+#
+# index_happy_thing_group_shares_on_group_id (group_id)
+# index_happy_thing_group_shares_on_happy_thing_id (happy_thing_id)
+#
+# Foreign Keys
+#
+# fk_rails_... (group_id => groups.id)
+# fk_rails_... (happy_thing_id => happy_things.id)
+#
FactoryBot.define do
factory :happy_thing_group_share do
association :happy_thing
diff --git a/spec/factories/happy_thing_user_shares.rb b/spec/factories/happy_thing_user_shares.rb
index 96132e8d..cfc14cf5 100644
--- a/spec/factories/happy_thing_user_shares.rb
+++ b/spec/factories/happy_thing_user_shares.rb
@@ -1,5 +1,25 @@
# frozen_string_literal: true
+# == Schema Information
+#
+# Table name: happy_thing_user_shares
+#
+# id :bigint not null, primary key
+# created_at :datetime not null
+# updated_at :datetime not null
+# friend_id :bigint not null
+# happy_thing_id :bigint not null
+#
+# Indexes
+#
+# index_happy_thing_user_shares_on_friend_id (friend_id)
+# index_happy_thing_user_shares_on_happy_thing_id (happy_thing_id)
+#
+# Foreign Keys
+#
+# fk_rails_... (friend_id => users.id)
+# fk_rails_... (happy_thing_id => happy_things.id)
+#
FactoryBot.define do
factory :happy_thing_user_share do
happy_thing
diff --git a/spec/factories/happy_things.rb b/spec/factories/happy_things.rb
index 205648c0..5a30eb64 100644
--- a/spec/factories/happy_things.rb
+++ b/spec/factories/happy_things.rb
@@ -1,5 +1,35 @@
# frozen_string_literal: true
+# == Schema Information
+#
+# Table name: happy_things
+#
+# id :bigint not null, primary key
+# body :text
+# latitude :float
+# longitude :float
+# place :string
+# share_location :boolean
+# start_time :datetime
+# status :integer
+# title :string not null
+# visibility :string default("public")
+# created_at :datetime not null
+# updated_at :datetime not null
+# category_id :bigint
+# user_id :bigint not null
+#
+# Indexes
+#
+# index_happy_things_on_category_id (category_id)
+# index_happy_things_on_user_id (user_id)
+# index_happy_things_on_visibility (visibility)
+#
+# Foreign Keys
+#
+# fk_rails_... (category_id => categories.id)
+# fk_rails_... (user_id => users.id)
+#
FactoryBot.define do
factory :happy_thing do
title { 'Today I was happy' }
diff --git a/spec/factories/users.rb b/spec/factories/users.rb
index 534b4486..b7c2aab2 100644
--- a/spec/factories/users.rb
+++ b/spec/factories/users.rb
@@ -1,5 +1,37 @@
# frozen_string_literal: true
+# == Schema Information
+#
+# Table name: users
+#
+# id :bigint not null, primary key
+# confirmation_sent_at :datetime
+# confirmation_token :string
+# confirmed_at :datetime
+# email :string default(""), not null
+# email_opt_in :boolean default(FALSE)
+# emoji :string
+# encrypted_password :string default(""), not null
+# first_name :string
+# last_name :string
+# location_opt_in :boolean default(FALSE)
+# provider :string
+# remember_created_at :datetime
+# reset_password_sent_at :datetime
+# reset_password_token :string
+# sign_in_count :integer default(0), not null
+# uid :string
+# unconfirmed_email :string
+# username :string
+# created_at :datetime not null
+# updated_at :datetime not null
+#
+# Indexes
+#
+# index_users_on_confirmation_token (confirmation_token) UNIQUE
+# index_users_on_email (email) UNIQUE
+# index_users_on_reset_password_token (reset_password_token) UNIQUE
+#
FactoryBot.define do
factory :user do
first_name { %w[Emmsi Leamaus Juanfairy].sample }
diff --git a/spec/models/friendship_spec.rb b/spec/models/friendship_spec.rb
index 8579581b..753cccbb 100644
--- a/spec/models/friendship_spec.rb
+++ b/spec/models/friendship_spec.rb
@@ -1,5 +1,27 @@
# frozen_string_literal: true
+# == Schema Information
+#
+# Table name: friendships
+#
+# id :bigint not null, primary key
+# accepted :boolean default(FALSE)
+# created_at :datetime not null
+# updated_at :datetime not null
+# friend_id :bigint
+# user_id :bigint
+#
+# Indexes
+#
+# index_friendships_on_friend_id (friend_id)
+# index_friendships_on_user_id (user_id)
+# index_friendships_on_user_id_and_friend_id (user_id,friend_id) UNIQUE
+#
+# Foreign Keys
+#
+# fk_rails_... (friend_id => users.id)
+# fk_rails_... (user_id => users.id)
+#
require 'rails_helper'
RSpec.describe Friendship, type: :model do
@@ -22,18 +44,28 @@
describe 'scopes' do
let!(:user1) { create(:user) }
let!(:user2) { create(:user) }
+ let!(:user3) { create(:user) }
+ # With bidirectional friendships, creating one friendship creates TWO records
let!(:accepted_friendship) { create(:friendship, user: user1, friend: user2, accepted: true) }
- let!(:pending_friendship) { create(:friendship, user: user2, friend: user1, accepted: false) }
+ let!(:pending_friendship) { create(:friendship, user: user1, friend: user3, accepted: false) }
it 'returns accepted friendships' do
- expect(Friendship.accepted).to include(accepted_friendship)
- expect(Friendship.accepted).not_to include(pending_friendship)
+ accepted_friendships = Friendship.accepted
+ # Should include both the original AND the inverse
+ expect(accepted_friendships.pluck(:user_id, :friend_id)).to include(
+ [user1.id, user2.id],
+ [user2.id, user1.id]
+ )
end
it 'returns pending friendships' do
- expect(Friendship.pending).to include(pending_friendship)
- expect(Friendship.pending).not_to include(accepted_friendship)
+ pending_friendships = Friendship.pending
+ # Should include both the original AND the inverse
+ expect(pending_friendships.pluck(:user_id, :friend_id)).to include(
+ [user1.id, user3.id],
+ [user3.id, user1.id]
+ )
end
end
end
diff --git a/spec/models/group_membership_spec.rb b/spec/models/group_membership_spec.rb
index ac4284ca..1ed7e276 100644
--- a/spec/models/group_membership_spec.rb
+++ b/spec/models/group_membership_spec.rb
@@ -1,5 +1,25 @@
# frozen_string_literal: true
+# == Schema Information
+#
+# Table name: group_memberships
+#
+# id :bigint not null, primary key
+# created_at :datetime not null
+# updated_at :datetime not null
+# friend_id :bigint not null
+# group_id :bigint not null
+#
+# Indexes
+#
+# index_group_memberships_on_friend_id (friend_id)
+# index_group_memberships_on_group_id (group_id)
+#
+# Foreign Keys
+#
+# fk_rails_... (friend_id => users.id)
+# fk_rails_... (group_id => groups.id)
+#
require 'rails_helper'
RSpec.describe GroupMembership, type: :model do
diff --git a/spec/models/group_spec.rb b/spec/models/group_spec.rb
index a051aa68..f1895228 100644
--- a/spec/models/group_spec.rb
+++ b/spec/models/group_spec.rb
@@ -1,5 +1,23 @@
# frozen_string_literal: true
+# == Schema Information
+#
+# Table name: groups
+#
+# id :bigint not null, primary key
+# name :string
+# created_at :datetime not null
+# updated_at :datetime not null
+# user_id :bigint not null
+#
+# Indexes
+#
+# index_groups_on_user_id (user_id)
+#
+# Foreign Keys
+#
+# fk_rails_... (user_id => users.id)
+#
require 'rails_helper'
RSpec.describe Group, type: :model do
diff --git a/spec/models/happy_thing_group_share_spec.rb b/spec/models/happy_thing_group_share_spec.rb
index 3d29769e..31910b78 100644
--- a/spec/models/happy_thing_group_share_spec.rb
+++ b/spec/models/happy_thing_group_share_spec.rb
@@ -1,5 +1,25 @@
# frozen_string_literal: true
+# == Schema Information
+#
+# Table name: happy_thing_group_shares
+#
+# id :bigint not null, primary key
+# created_at :datetime not null
+# updated_at :datetime not null
+# group_id :bigint not null
+# happy_thing_id :bigint not null
+#
+# Indexes
+#
+# index_happy_thing_group_shares_on_group_id (group_id)
+# index_happy_thing_group_shares_on_happy_thing_id (happy_thing_id)
+#
+# Foreign Keys
+#
+# fk_rails_... (group_id => groups.id)
+# fk_rails_... (happy_thing_id => happy_things.id)
+#
require 'rails_helper'
RSpec.describe HappyThingGroupShare, type: :model do
diff --git a/spec/models/happy_thing_spec.rb b/spec/models/happy_thing_spec.rb
index 26ef921c..1d1e82b9 100644
--- a/spec/models/happy_thing_spec.rb
+++ b/spec/models/happy_thing_spec.rb
@@ -1,5 +1,35 @@
# frozen_string_literal: true
+# == Schema Information
+#
+# Table name: happy_things
+#
+# id :bigint not null, primary key
+# body :text
+# latitude :float
+# longitude :float
+# place :string
+# share_location :boolean
+# start_time :datetime
+# status :integer
+# title :string not null
+# visibility :string default("public")
+# created_at :datetime not null
+# updated_at :datetime not null
+# category_id :bigint
+# user_id :bigint not null
+#
+# Indexes
+#
+# index_happy_things_on_category_id (category_id)
+# index_happy_things_on_user_id (user_id)
+# index_happy_things_on_visibility (visibility)
+#
+# Foreign Keys
+#
+# fk_rails_... (category_id => categories.id)
+# fk_rails_... (user_id => users.id)
+#
require 'rails_helper'
RSpec.describe HappyThing, type: :model do
@@ -43,9 +73,9 @@
user = create(:user)
friends = create_list(:user, 3)
+ # With bidirectional friendships, creating one friendship creates both records
friends.each do |friend|
- create(:friendship, user:, friend:)
- create(:friendship, user: friend, friend: user)
+ create(:friendship, user:, friend:, accepted: true)
end
perform_enqueued_jobs do
@@ -69,9 +99,9 @@
friends = create_list(:user, 3)
non_friend = create(:user)
+ # With bidirectional friendships, creating one friendship creates both records
friends.each do |friend|
- create(:friendship, user:, friend:)
- create(:friendship, user: friend, friend: user)
+ create(:friendship, user:, friend:, accepted: true)
end
create_list(:happy_thing, 4, user:)
diff --git a/spec/models/happy_thing_user_share_spec.rb b/spec/models/happy_thing_user_share_spec.rb
index 34a7b1d0..7958130a 100644
--- a/spec/models/happy_thing_user_share_spec.rb
+++ b/spec/models/happy_thing_user_share_spec.rb
@@ -1,5 +1,25 @@
# frozen_string_literal: true
+# == Schema Information
+#
+# Table name: happy_thing_user_shares
+#
+# id :bigint not null, primary key
+# created_at :datetime not null
+# updated_at :datetime not null
+# friend_id :bigint not null
+# happy_thing_id :bigint not null
+#
+# Indexes
+#
+# index_happy_thing_user_shares_on_friend_id (friend_id)
+# index_happy_thing_user_shares_on_happy_thing_id (happy_thing_id)
+#
+# Foreign Keys
+#
+# fk_rails_... (friend_id => users.id)
+# fk_rails_... (happy_thing_id => happy_things.id)
+#
require 'rails_helper'
RSpec.describe HappyThingUserShare, type: :model do
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index ad3b85d1..46db60c1 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -1,5 +1,37 @@
# frozen_string_literal: true
+# == Schema Information
+#
+# Table name: users
+#
+# id :bigint not null, primary key
+# confirmation_sent_at :datetime
+# confirmation_token :string
+# confirmed_at :datetime
+# email :string default(""), not null
+# email_opt_in :boolean default(FALSE)
+# emoji :string
+# encrypted_password :string default(""), not null
+# first_name :string
+# last_name :string
+# location_opt_in :boolean default(FALSE)
+# provider :string
+# remember_created_at :datetime
+# reset_password_sent_at :datetime
+# reset_password_token :string
+# sign_in_count :integer default(0), not null
+# uid :string
+# unconfirmed_email :string
+# username :string
+# created_at :datetime not null
+# updated_at :datetime not null
+#
+# Indexes
+#
+# index_users_on_confirmation_token (confirmation_token) UNIQUE
+# index_users_on_email (email) UNIQUE
+# index_users_on_reset_password_token (reset_password_token) UNIQUE
+#
require 'rails_helper'
RSpec.describe User, type: :model do
@@ -133,9 +165,8 @@
context 'when unconfirmed manual user tries OAuth' do
it 'links OAuth and auto-confirms existing account' do
- existing_user = create(:user,
- email: auth_hash.info.email,
- confirmed_at: nil)
+ existing_user = create(:user, email: auth_hash.info.email)
+ existing_user.update_column(:confirmed_at, nil)
user = User.from_omniauth(auth_hash)
existing_user.reload
diff --git a/spec/requests/friendships_spec.rb b/spec/requests/friendships_spec.rb
index dfa15bd8..510a4c3f 100644
--- a/spec/requests/friendships_spec.rb
+++ b/spec/requests/friendships_spec.rb
@@ -7,14 +7,14 @@
let(:friend) { create(:user) }
before do
- sign_in user
+ sign_in user, scope: :user
end
describe 'POST /create' do
it 'creates a new friendship' do
expect do
post friendships_path, params: { friend_id: friend.id }
- end.to change(Friendship, :count).by(1)
+ end.to change(Friendship, :count).by(2) # Bidirectional: creates 2 records
expect(response).to have_http_status(:redirect) # or :success
end
end
@@ -26,6 +26,9 @@
put friendship_path(friendship), params: { friendship: { accepted: true } }
expect(response).to have_http_status(:redirect)
expect(friendship.reload.accepted).to eq(true)
+ # Check that inverse was also updated
+ inverse = Friendship.find_by(user_id: friend.id, friend_id: user.id)
+ expect(inverse.accepted).to eq(true)
end
end
@@ -35,7 +38,7 @@
it 'deletes the friendship' do
expect do
delete friendship_path(friendship)
- end.to change(Friendship, :count).by(-1)
+ end.to change(Friendship, :count).by(-2) # Bidirectional: deletes 2 records
expect(response).to have_http_status(:redirect)
end
end
diff --git a/spec/requests/happy_things_spec.rb b/spec/requests/happy_things_spec.rb
index 6dafd696..a2ff791b 100644
--- a/spec/requests/happy_things_spec.rb
+++ b/spec/requests/happy_things_spec.rb
@@ -8,11 +8,9 @@
let(:groupie) { create(:user, first_name: 'Groupie') }
let(:stranger) { create(:user, first_name: 'Stranger') }
+ # With bidirectional friendships, creating one friendship creates both records
let!(:friendship_one) { create(:friendship, user: owner, friend:, accepted: true) }
- let!(:friendship_two) { create(:friendship, user: friend, friend: owner, accepted: true) }
-
let!(:friendship_three) { create(:friendship, user: owner, friend: groupie, accepted: true) }
- let!(:friendship_four) { create(:friendship, user: groupie, friend: owner, accepted: true) }
let!(:happy_thing_user_shared) { create(:happy_thing, user: owner, title: 'Directly Shared') }
let!(:happy_thing_group_shared) { create(:happy_thing, user: owner, title: 'Group Shared') }
@@ -26,19 +24,19 @@
describe 'visibility rules' do
it 'shows directly shared happy thing to the friend' do
- sign_in friend
+ sign_in friend, scope: :user
get root_path
expect(response.body).to include('Directly Shared')
end
it 'shows group shared happy thing to the group member' do
- sign_in groupie
+ sign_in groupie, scope: :user
get root_path
expect(response.body).to include('Group Shared')
end
it 'shows happy thing to the owner' do
- sign_in owner
+ sign_in owner, scope: :user
get root_path
expect(response.body).to include('Directly Shared')
expect(response.body).to include('Group Shared')
@@ -46,7 +44,7 @@
end
it 'does not show private happy thing to a stranger' do
- sign_in stranger
+ sign_in stranger, scope: :user
get root_path
expect(response.body).not_to include('Directly Shared')
expect(response.body).not_to include('Group Shared')
@@ -56,29 +54,31 @@
describe 'location sharing' do
it 'saves location when share_location is checked' do
- sign_in owner
+ sign_in owner, scope: :user
expect do
post happy_things_path, params: {
happy_thing: {
title: 'Shared with location',
share_location: '1',
- place: 'Berlin'
+ place: 'Berlin',
+ latitude: 52.5173885,
+ longitude: 13.3951309
}
}
end.to change(HappyThing, :count).by(1)
happy_thing = HappyThing.last
expect(happy_thing.share_location).to be(true)
- expect(happy_thing.latitude).to be_within(0.001).of(52.5173885)
- expect(happy_thing.longitude).to be_within(0.001).of(13.3951309)
expect(happy_thing.place).to eq('Berlin')
+ expect(happy_thing.latitude).to eq(52.5173885)
+ expect(happy_thing.longitude).to eq(13.3951309)
end
end
describe 'GET /calendar' do
it 'returns a success response' do
- sign_in owner
+ sign_in owner, scope: :user
get calendar_path
expect(response).to have_http_status(:success)
expect(response.body).to include('Tue')
@@ -87,7 +87,7 @@
describe 'GET /friends/happy_things' do
it 'returns a success response' do
- sign_in owner
+ sign_in owner, scope: :user
get friends_happy_things_path
expect(response).to have_http_status(:success)
expect(response.body).to include('What made you happy')
@@ -96,7 +96,7 @@
describe 'GET /through_the_years' do
it 'returns a success response' do
- sign_in owner
+ sign_in owner, scope: :user
get through_the_years_path
expect(response).to have_http_status(:success)
expect(response.body).to include('Add a Happy Thing from a past year')
@@ -105,7 +105,7 @@
describe 'GET /future_root' do
it 'returns a success response' do
- sign_in owner
+ sign_in owner, scope: :user
get future_root_path
expect(response).to have_http_status(:success)
expect(response.body).to include('What made you smile today?')
diff --git a/spec/requests/users_spec.rb b/spec/requests/users_spec.rb
index 9724a233..15f0ec2c 100644
--- a/spec/requests/users_spec.rb
+++ b/spec/requests/users_spec.rb
@@ -10,13 +10,6 @@
end
describe 'CRUD operations' do
- describe 'GET /index' do
- it 'returns http success' do
- get '/users'
- expect(response).to have_http_status(:success)
- end
- end
-
describe 'GET /show' do
it 'returns http success' do
user = create(:user)
@@ -101,7 +94,7 @@
it 'returns http success' do
get friends_path
expect(response).to have_http_status(:success)
- expect(response.body).to include('My Friends')
+ expect(response.body).to include(I18n.t('friends.page_title'))
end
end
@@ -109,7 +102,8 @@
it 'returns http success' do
get profile_path
expect(response).to have_http_status(:success)
- expect(response.body).to include('My Profile')
+ expect(response.body).to include('Happy Count')
+ expect(response.body).to include(@user.first_name)
end
end
end
diff --git a/spec/system/happy_things_crud_spec.rb b/spec/system/happy_things_crud_spec.rb
index 840bb5ce..3c311e4d 100644
--- a/spec/system/happy_things_crud_spec.rb
+++ b/spec/system/happy_things_crud_spec.rb
@@ -38,12 +38,11 @@
fill_in 'Name', with: 'cute mirror wtf'
select 'Spiritual & Mind', from: 'happy_thing_category_id'
attach_file 'happy_thing[photo]', Rails.root.join('spec/fixtures/test_image.jpg')
- check 'Share my location'
expect do
- click_on 'Create happy thing'
+ find('input[type="submit"]').click
- expect(page).to have_content('Happy Thing was successfully created.')
+ expect(page).to have_content('Happy Thing was successfully created.', wait: 10)
end.to change(HappyThing, :count).by(1)
created_happy_thing = HappyThing.last
@@ -61,9 +60,9 @@
expect(page).to have_current_path(edit_happy_thing_path(happy_thing))
fill_in 'Name', with: 'fresh new title'
- click_button('Update happy thing')
+ find('input[type="submit"]').click
- expect(page).to have_content('Yay! 🎉 Happy Thing was updated 🥰')
+ expect(page).to have_content('Yay! 🎉 Happy Thing was updated 🥰', wait: 10)
expect(page).to have_content('fresh new title')
expect(page).not_to have_content(happy_thing.title, wait: 5)
end