Merge pull request #140 from emmvs/fix/cannot-delete-account-lol

Fix/cannot delete account lol

Author: brunotho

Gemfile

@@ -33,7 +33,7 @@ gem 'sassc-rails' # Use SCSS for stylesheets
 # Devise for authentication
 gem 'devise', '~> 4.8'
 
-#OAauth Providers
+# OAauth Providers
 gem 'omniauth-google-oauth2'
 gem 'omniauth-rails_csrf_protection'
 
@@ -71,16 +71,15 @@ group :development, :test do
 end
 
 group :development do
-  gem 'web-console' # Rails console for the browser
   gem 'annotate' # Annotate models with schema
+  gem 'web-console' # Rails console for the browser
   # gem 'spring' # Speeds up development by keeping app running in the background
   # gem 'rack-mini-profiler' # Displays speed badge for performance profiling
 end
 
 group :test do
   gem 'capybara' # Capybara for integration testing
   gem 'selenium-webdriver' # WebDriver for browsers
-  gem 'webdrivers' # Auto-updates webdrivers
 end
 
 # Optional gems for specific features

Gemfile.lock

@@ -332,7 +332,7 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    rexml (3.2.6)
+    rexml (3.4.1)
     rspec-core (3.12.2)
       rspec-support (~> 3.12.0)
     rspec-expectations (3.12.3)
@@ -369,7 +369,7 @@ GEM
       faraday-multipart (>= 1)
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
-    rubyzip (2.3.2)
+    rubyzip (2.4.1)
     sassc (2.4.0)
       ffi (~> 1.9)
     sassc-rails (2.1.2)
@@ -378,7 +378,9 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
-    selenium-webdriver (4.16.0)
+    selenium-webdriver (4.32.0)
+      base64 (~> 0.2)
+      logger (~> 1.4)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)
@@ -420,11 +422,7 @@ GEM
       activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
       railties (>= 6.0.0)
-    webdrivers (5.2.0)
-      nokogiri (~> 1.6)
-      rubyzip (>= 1.3.0)
-      selenium-webdriver (~> 4.0)
-    websocket (1.2.10)
+    websocket (1.2.11)
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
@@ -479,7 +477,6 @@ DEPENDENCIES
   stimulus-rails
   turbo-rails
   web-console
-  webdrivers
 
 RUBY VERSION
    ruby 3.1.2p20

app/assets/stylesheets/components/_navbar.scss

@@ -70,14 +70,14 @@
   border-bottom-right-radius: 50px;
 }
 
-/* Mobile */
+/* Desktop */
 @media screen and (min-width: 768px) {
   .bottom-navbar {
     display: none !important;
   }
 }
 
-/* Desktop */
+/* Mobile */
 @media screen and (max-width: 767px) {
   .bottom-navbar {
     display: flex;

app/models/happy_thing.rb

@@ -23,8 +23,7 @@ class HappyThing < ApplicationRecord
 
   belongs_to :user
   belongs_to :category
-  has_many :likes
-  has_many :comments
+  has_many :comments, dependent: :destroy
   has_many :happy_thing_user_shares, dependent: :destroy
   has_many :shared_users, through: :happy_thing_user_shares, source: :friend
   has_many :happy_thing_group_shares, dependent: :destroy

app/models/like.rb

@@ -54,18 +54,17 @@ class User < ApplicationRecord # rubocop:disable Metrics/ClassLength
   validates :provider, presence: true, on: :oauth_linking
   validates :uid, presence: true, on: :oauth_linking
 
-  has_many :happy_things
-  has_many :comments
-  has_many :likes
+  has_many :happy_things, dependent: :destroy
+  has_many :comments, dependent: :destroy
   has_many :groups, dependent: :destroy
   has_many :happy_thing_user_shares, foreign_key: :friend_id, dependent: :destroy
   has_many :received_happy_things, through: :happy_thing_user_shares, source: :happy_thing
-  has_many :group_memberships, foreign_key: :friend_id
+  has_many :group_memberships, foreign_key: :friend_id, dependent: :destroy
   has_many :groups_as_member, through: :group_memberships, source: :group
 
   # Friendships
-  has_many :friendships
-  has_many :received_friend_requests, class_name: 'Friendship', foreign_key: 'friend_id'
+  has_many :friendships, dependent: :destroy
+  has_many :received_friend_requests, class_name: 'Friendship', foreign_key: 'friend_id', dependent: :destroy
   has_many :friends, -> { where(friendships: { accepted: true }) }, through: :friendships, source: :friend
   has_many :friends_who_added_me, lambda {
                                     where(friendships: { accepted: true })

app/models/user.rb

@@ -47,7 +47,7 @@
 
   <h4>Cancel my account</h4>
 
-  <p>Unhappy? <%= link_to "Cancel my account", registration_path(resource_name), data: { confirm: "Are you sure?" }, method: :delete %></p>
+  <p>Unhappy? <%= link_to "Cancel my account", registration_path(resource_name), data: { turbo_confirm: "Are you sure?", turbo_method: :delete } %></p>
 
   <%= link_to "Back", :back %>
 </div>

app/views/devise/registrations/edit.html.erb

@@ -75,4 +75,16 @@
 
   config.include Devise::Test::IntegrationHelpers, type: :request
   config.include ActiveJob::TestHelper
+
+  config.before(:each, type: :system) do
+    Capybara.register_driver :custom_selenium_chrome_headless do |app|
+      options = Selenium::WebDriver::Chrome::Options.new
+      options.add_argument('--headless')
+      options.add_argument('--window-size=767,1024')
+
+      Capybara::Selenium::Driver.new(app, browser: :chrome, options:)
+    end
+
+    driven_by :custom_selenium_chrome_headless
+  end
 end

spec/fixtures/test_image.jpg

@@ -82,4 +82,13 @@
       expect(response.body).to include(I18n.t('errors.models.user.password.invalid'))
     end
   end
+
+  describe 'DELETE /destroy' do
+    it 'allows users to delete their account' do
+      delete user_registration_path
+      expect(response).to have_http_status(:found)
+      expect(response).to redirect_to(root_path)
+      expect(User.find_by(id: @user.id)).to be_nil
+    end
+  end
 end