Iterate on CI/CD

Author: sayhiben

.github/workflows/pr-validation.yml

@@ -89,6 +89,17 @@ jobs:
     - name: Install dependencies
       run: |
         yarn install --frozen-lockfile --prefer-offline
+
+    - name: Run Ruby lint
+      run: bundle exec rubocop
+
+    - name: Run JavaScript lint
+      run: yarn lint:js
+
+    - name: Build assets
+      run: |
+        yarn build
+        yarn build:css
     
     - name: Setup test database
       env:

Gemfile

@@ -83,6 +83,9 @@ group :development, :test do
   # See https://guides.rubyonrails.org/debugging_rails_applications.html#debugging-with-the-debug-gem
   gem "debug", platforms: %i[mri windows], require: "debug/prelude"
 
+  # Dependency vulnerability scanning
+  gem "bundler-audit", require: false
+
   # Static analysis for security vulnerabilities [https://brakemanscanner.org/]
   gem "brakeman", require: false
 

Gemfile.lock

@@ -94,6 +94,9 @@ GEM
     bullet (8.1.0)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
+    bundler-audit (0.9.3)
+      bundler (>= 1.2.0)
+      thor (~> 1.0)
     case_transform (0.2)
       activesupport
     concurrent-ruby (1.3.6)
@@ -440,6 +443,7 @@ DEPENDENCIES
   bootsnap
   brakeman
   bullet
+  bundler-audit
   cssbundling-rails
   database_cleaner-active_record
   debug

app/controllers/api/v1/registrations_controller.rb

@@ -20,8 +20,8 @@ def respond_with(resource, _opts = {})
       end
 
       def sign_up_params
-        params.require(:user).permit(:email, :password, :password_confirmation, :role)
+        params.require(:user).permit(:email, :password, :password_confirmation)
       end
     end
   end
-end
+end

spec/controllers/api/v1/ignore_lists_controller_spec.rb

@@ -6,7 +6,7 @@
 
   describe 'GET #index' do
     before do
-      sign_in user
+      request.headers.merge!(auth_headers(admin))
       create_list(:ignore_list, 3, :twitch_user)
       create_list(:ignore_list, 2, :discord_user)
       create_list(:ignore_list, 2, :url)
@@ -44,7 +44,7 @@
 
   describe 'GET #by_type' do
     before do
-      sign_in user
+      request.headers.merge!(auth_headers(admin))
       create(:ignore_list, list_type: 'twitch_user', value: 'baduser1')
       create(:ignore_list, list_type: 'twitch_user', value: 'baduser2')
       create(:ignore_list, list_type: 'discord_user', value: 'spammer#1234')
@@ -67,7 +67,7 @@
   describe 'GET #show' do
     let(:ignore_list) { create(:ignore_list) }
 
-    before { sign_in user }
+    before { request.headers.merge!(auth_headers(admin)) }
 
     it 'returns the ignore list' do
       get :show, params: { id: ignore_list.id }
@@ -79,7 +79,7 @@
 
   describe 'POST #create' do
     context 'as admin' do
-      before { sign_in admin }
+      before { request.headers.merge!(auth_headers(admin)) }
 
       it 'creates a new ignore list' do
         expect {
@@ -104,14 +104,14 @@
             value: 'test'
           }
         }
-        expect(response).to have_http_status(:unprocessable_entity)
+        expect(response).to have_http_status(:unprocessable_content)
         json = JSON.parse(response.body)
         expect(json['errors']).to include('List type is not included in the list')
       end
     end
 
     context 'as regular user' do
-      before { sign_in user }
+      before { request.headers.merge!(auth_headers(user)) }
 
       it 'returns forbidden' do
         post :create, params: {
@@ -126,7 +126,7 @@
   end
 
   describe 'POST #bulk_create' do
-    before { sign_in admin }
+    before { request.headers.merge!(auth_headers(admin)) }
 
     it 'creates multiple ignore lists' do
       expect {
@@ -166,7 +166,7 @@
     let(:ignore_list) { create(:ignore_list) }
 
     context 'as admin' do
-      before { sign_in admin }
+      before { request.headers.merge!(auth_headers(admin)) }
 
       it 'updates the ignore list' do
         patch :update, params: {
@@ -181,7 +181,7 @@
     end
 
     context 'as regular user' do
-      before { sign_in user }
+      before { request.headers.merge!(auth_headers(user)) }
 
       it 'returns forbidden' do
         patch :update, params: {
@@ -197,7 +197,7 @@
     let!(:ignore_list) { create(:ignore_list) }
 
     context 'as admin' do
-      before { sign_in admin }
+      before { request.headers.merge!(auth_headers(admin)) }
 
       it 'deletes the ignore list' do
         expect {
@@ -208,7 +208,7 @@
     end
 
     context 'as regular user' do
-      before { sign_in user }
+      before { request.headers.merge!(auth_headers(user)) }
 
       it 'returns forbidden' do
         delete :destroy, params: { id: ignore_list.id }
@@ -221,7 +221,7 @@
     let!(:lists) { create_list(:ignore_list, 5) }
 
     context 'as admin' do
-      before { sign_in admin }
+      before { request.headers.merge!(auth_headers(admin)) }
 
       it 'deletes multiple ignore lists' do
         ids_to_delete = lists.first(3).map(&:id)
@@ -235,4 +235,4 @@
       end
     end
   end
-end
+end

spec/rails_helper.rb

@@ -68,6 +68,7 @@
 
   # Include Devise test helpers
   config.include Devise::Test::IntegrationHelpers, type: :request
+  config.include Devise::Test::ControllerHelpers, type: :controller
 
   # Database cleaner setup
   config.before(:suite) do

spec/requests/admin/streamers_spec.rb

@@ -147,7 +147,7 @@
 
       it "returns unprocessable entity status" do
         post admin_streamers_path, params: invalid_params
-        expect(response).to have_http_status(:unprocessable_entity)
+        expect(response).to have_http_status(:unprocessable_content)
       end
     end
   end
@@ -219,7 +219,7 @@
 
       it "returns unprocessable entity status" do
         patch admin_streamer_path(streamer), params: invalid_params
-        expect(response).to have_http_status(:unprocessable_entity)
+        expect(response).to have_http_status(:unprocessable_content)
       end
     end
   end

spec/requests/admin/streams_refactored_spec.rb

@@ -88,7 +88,7 @@
 
       it "returns unprocessable entity" do
         post admin_streams_path, params: invalid_params
-        expect(response).to have_http_status(:unprocessable_entity)
+        expect(response).to have_http_status(:unprocessable_content)
       end
     end
   end

spec/requests/admin/streams_spec.rb

@@ -103,7 +103,7 @@
 
       it "returns unprocessable entity" do
         post admin_streams_path, params: invalid_params
-        expect(response).to have_http_status(:unprocessable_entity)
+        expect(response).to have_http_status(:unprocessable_content)
       end
     end
   end

spec/requests/admin/timestamps_spec.rb

@@ -138,7 +138,7 @@ def login_admin
 
       it "returns unprocessable entity" do
         post admin_timestamps_path, params: invalid_params
-        expect(response).to have_http_status(:unprocessable_entity)
+        expect(response).to have_http_status(:unprocessable_content)
       end
     end
   end