RubyGems - bullet - Versions diffs - 6.1.0 → 7.0.4 - Mend

bullet 6.1.0 → 7.0.4

Files changed (60) hide show

checksums.yaml +4 -4
data/.github/workflows/main.yml +82 -0
data/CHANGELOG.md +50 -0
data/Gemfile.rails-6.0 +1 -1
data/Gemfile.rails-6.1 +15 -0
data/Gemfile.rails-7.0 +10 -0
data/MIT-LICENSE +1 -1
data/README.md +38 -26
data/lib/bullet/active_job.rb +5 -1
data/lib/bullet/active_record41.rb +1 -0
data/lib/bullet/active_record42.rb +1 -0
data/lib/bullet/active_record5.rb +6 -4
data/lib/bullet/active_record52.rb +28 -21
data/lib/bullet/active_record60.rb +27 -20
data/lib/bullet/active_record61.rb +274 -0
data/lib/bullet/active_record70.rb +277 -0
data/lib/bullet/bullet_xhr.js +18 -17
data/lib/bullet/dependency.rb +16 -0
data/lib/bullet/detector/base.rb +2 -1
data/lib/bullet/detector/counter_cache.rb +2 -2
data/lib/bullet/detector/n_plus_one_query.rb +5 -5
data/lib/bullet/detector/unused_eager_loading.rb +2 -2
data/lib/bullet/mongoid4x.rb +1 -1
data/lib/bullet/mongoid5x.rb +1 -1
data/lib/bullet/mongoid6x.rb +1 -1
data/lib/bullet/mongoid7x.rb +32 -17
data/lib/bullet/notification.rb +2 -1
data/lib/bullet/rack.rb +28 -19
data/lib/bullet/stack_trace_filter.rb +7 -9
data/lib/bullet/version.rb +1 -1
data/lib/bullet.rb +29 -28
data/lib/generators/bullet/install_generator.rb +22 -25
data/perf/benchmark.rb +4 -1
data/spec/bullet/detector/counter_cache_spec.rb +1 -1
data/spec/bullet/detector/n_plus_one_query_spec.rb +1 -1
data/spec/bullet/detector/unused_eager_loading_spec.rb +10 -10
data/spec/bullet/ext/object_spec.rb +1 -1
data/spec/bullet/notification/base_spec.rb +4 -4
data/spec/bullet/notification/n_plus_one_query_spec.rb +1 -3
data/spec/bullet/rack_spec.rb +135 -9
data/spec/bullet_spec.rb +15 -15
data/spec/integration/active_record/association_spec.rb +73 -11
data/spec/integration/counter_cache_spec.rb +4 -4
data/spec/integration/mongoid/association_spec.rb +4 -4
data/spec/models/attachment.rb +5 -0
data/spec/models/deal.rb +5 -0
data/spec/models/folder.rb +2 -1
data/spec/models/group.rb +2 -1
data/spec/models/page.rb +2 -1
data/spec/models/post.rb +2 -0
data/spec/models/role.rb +7 -0
data/spec/models/submission.rb +1 -0
data/spec/models/user.rb +2 -0
data/spec/models/writer.rb +2 -1
data/spec/spec_helper.rb +0 -2
data/spec/support/mongo_seed.rb +1 -0
data/spec/support/sqlite_seed.rb +38 -0
data/test.sh +2 -0
metadata +17 -7
data/.travis.yml +0 -33

data/spec/bullet/rack_spec.rb CHANGED Viewed

@@ -31,12 +31,6 @@ module Bullet
         response = double(body: '<html><head></head><body></body></html>')
         expect(middleware).not_to be_html_request(headers, response)
       end
-      it "should be false if response body doesn't contain html tag" do
-        headers = { 'Content-Type' => 'text/html' }
-        response = double(body: '<div>Partial</div>')
-        expect(middleware).not_to be_html_request(headers, response)
-      end
     end
     context 'empty?' do
@@ -54,6 +48,11 @@ module Bullet
         response = double(body: '')
         expect(middleware).to be_empty(response)
       end
+      it 'should be true if no response body' do
+        response = double()
+        expect(middleware).to be_empty(response)
+      end
     end
     context '#call' do
@@ -67,9 +66,8 @@ module Bullet
         it 'should change response body if notification is active' do
           expect(Bullet).to receive(:notification?).and_return(true)
-          allow(Bullet).to receive(:skip_html_injection?).and_return(false)
+          expect(Bullet).to receive(:console_enabled?).and_return(true)
           expect(Bullet).to receive(:gather_inline_notifications).and_return('<bullet></bullet>')
-          expect(middleware).to receive(:xhr_script).and_return('')
           expect(Bullet).to receive(:perform_out_of_channel_notifications)
           _, headers, response = middleware.call('Content-Type' => 'text/html')
           expect(headers['Content-Length']).to eq('56')
@@ -81,9 +79,123 @@ module Bullet
           response.body = '<html><head></head><body>é</body></html>'
           app.response = response
           expect(Bullet).to receive(:notification?).and_return(true)
+          allow(Bullet).to receive(:console_enabled?).and_return(true)
           expect(Bullet).to receive(:gather_inline_notifications).and_return('<bullet></bullet>')
           _, headers, response = middleware.call('Content-Type' => 'text/html')
-          expect(headers['Content-Length']).to eq((58 + middleware.send(:xhr_script).length).to_s)
+          expect(headers['Content-Length']).to eq('58')
+        end
+        context 'with injection notifiers' do
+          before do
+            expect(Bullet).to receive(:notification?).and_return(true)
+            allow(Bullet).to receive(:gather_inline_notifications).and_return('<bullet></bullet>')
+            allow(middleware).to receive(:xhr_script).and_return('<script></script>')
+            allow(middleware).to receive(:footer_note).and_return('footer')
+            expect(Bullet).to receive(:perform_out_of_channel_notifications)
+          end
+          it 'should change response body if add_footer is true' do
+            expect(Bullet).to receive(:add_footer).exactly(3).times.and_return(true)
+            _, headers, response = middleware.call('Content-Type' => 'text/html')
+            expect(headers['Content-Length']).to eq((73 + middleware.send(:footer_note).length).to_s)
+            expect(response).to eq(%w[<html><head></head><body>footer<bullet></bullet><script></script></body></html>])
+          end
+          it 'should change response body for html safe string if add_footer is true' do
+            expect(Bullet).to receive(:add_footer).exactly(3).times.and_return(true)
+            app.response =
+              Support::ResponseDouble.new.tap do |response|
+                response.body = ActiveSupport::SafeBuffer.new('<html><head></head><body></body></html>')
+              end
+            _, headers, response = middleware.call('Content-Type' => 'text/html')
+            expect(headers['Content-Length']).to eq((73 + middleware.send(:footer_note).length).to_s)
+            expect(response).to eq(%w[<html><head></head><body>footer<bullet></bullet><script></script></body></html>])
+          end
+          it 'should add the footer-text header for non-html requests when add_footer is true' do
+            allow(Bullet).to receive(:add_footer).at_least(:once).and_return(true)
+            allow(Bullet).to receive(:footer_info).and_return(['footer text'])
+            app.headers = { 'Content-Type' => 'application/json' }
+            _, headers, _response = middleware.call({})
+            expect(headers).to include('X-bullet-footer-text' => '["footer text"]')
+          end
+          it 'should change response body if console_enabled is true' do
+            expect(Bullet).to receive(:console_enabled?).and_return(true)
+            _, headers, response = middleware.call('Content-Type' => 'text/html')
+            expect(headers['Content-Length']).to eq('56')
+            expect(response).to eq(%w[<html><head></head><body><bullet></bullet></body></html>])
+          end
+          it 'should change response body for html safe string if console_enabled is true' do
+            expect(Bullet).to receive(:console_enabled?).and_return(true)
+            app.response =
+              Support::ResponseDouble.new.tap do |response|
+                response.body = ActiveSupport::SafeBuffer.new('<html><head></head><body></body></html>')
+              end
+            _, headers, response = middleware.call('Content-Type' => 'text/html')
+            expect(headers['Content-Length']).to eq('56')
+            expect(response).to eq(%w[<html><head></head><body><bullet></bullet></body></html>])
+          end
+          it 'should add headers for non-html requests when console_enabled is true' do
+            allow(Bullet).to receive(:console_enabled?).at_least(:once).and_return(true)
+            allow(Bullet).to receive(:text_notifications).and_return(['text notifications'])
+            app.headers = { 'Content-Type' => 'application/json' }
+            _, headers, _response = middleware.call({})
+            expect(headers).to include('X-bullet-console-text' => '["text notifications"]')
+          end
+          it "shouldn't change response body unnecessarily" do
+            expected_response = Support::ResponseDouble.new 'Actual body'
+            app.response = expected_response
+            _, _, response = middleware.call({})
+            expect(response).to eq(expected_response)
+          end
+          it "shouldn't add headers unnecessarily" do
+            app.headers = { 'Content-Type' => 'application/json' }
+            _, headers, _response = middleware.call({})
+            expect(headers).not_to include('X-bullet-footer-text')
+            expect(headers).not_to include('X-bullet-console-text')
+          end
+          context 'when skip_http_headers is enabled' do
+            before do
+              allow(Bullet).to receive(:skip_http_headers).and_return(true)
+            end
+            it 'should include the footer but not the xhr script tag if add_footer is true' do
+              expect(Bullet).to receive(:add_footer).at_least(:once).and_return(true)
+              _, headers, response = middleware.call({})
+              expect(headers['Content-Length']).to eq((56 + middleware.send(:footer_note).length).to_s)
+              expect(response).to eq(%w[<html><head></head><body>footer<bullet></bullet></body></html>])
+            end
+            it 'should not include the xhr script tag if console_enabled is true' do
+              expect(Bullet).to receive(:console_enabled?).and_return(true)
+              _, headers, response = middleware.call({})
+              expect(headers['Content-Length']).to eq('56')
+              expect(response).to eq(%w[<html><head></head><body><bullet></bullet></body></html>])
+            end
+            it 'should not add the footer-text header for non-html requests when add_footer is true' do
+              allow(Bullet).to receive(:add_footer).at_least(:once).and_return(true)
+              app.headers = { 'Content-Type' => 'application/json' }
+              _, headers, _response = middleware.call({})
+              expect(headers).not_to include('X-bullet-footer-text')
+            end
+            it 'should not add headers for non-html requests when console_enabled is true' do
+              allow(Bullet).to receive(:console_enabled?).at_least(:once).and_return(true)
+              app.headers = { 'Content-Type' => 'application/json' }
+              _, headers, _response = middleware.call({})
+              expect(headers).not_to include('X-bullet-console-text')
+            end
+          end
         end
         context 'when skip_html_injection is enabled' do
@@ -148,6 +260,20 @@ module Bullet
           expect(middleware.response_body(response)).to eq body_string
         end
       end
+      begin
+        require 'rack/files'
+        context 'when `response` is a Rack::Files::Iterator' do
+          let(:response) { instance_double(::Rack::Files::Iterator) }
+          before { allow(response).to receive(:is_a?).with(::Rack::Files::Iterator) { true } }
+          it 'should return nil' do
+            expect(middleware.response_body(response)).to be_nil
+          end
+        end
+      rescue LoadError
+      end
     end
   end
 end

data/spec/bullet_spec.rb CHANGED Viewed

@@ -74,31 +74,31 @@ describe Bullet, focused: true do
     end
   end
-  describe '#add_whitelist' do
+  describe '#add_safelist' do
     context "for 'special' class names" do
-      it 'is added to the whitelist successfully' do
-        Bullet.add_whitelist(type: :n_plus_one_query, class_name: 'Klass', association: :department)
-        expect(Bullet.get_whitelist_associations(:n_plus_one_query, 'Klass')).to include :department
+      it 'is added to the safelist successfully' do
+        Bullet.add_safelist(type: :n_plus_one_query, class_name: 'Klass', association: :department)
+        expect(Bullet.get_safelist_associations(:n_plus_one_query, 'Klass')).to include :department
       end
     end
   end
-  describe '#delete_whitelist' do
+  describe '#delete_safelist' do
     context "for 'special' class names" do
-      it 'is deleted from the whitelist successfully' do
-        Bullet.add_whitelist(type: :n_plus_one_query, class_name: 'Klass', association: :department)
-        Bullet.delete_whitelist(type: :n_plus_one_query, class_name: 'Klass', association: :department)
-        expect(Bullet.whitelist[:n_plus_one_query]).to eq({})
+      it 'is deleted from the safelist successfully' do
+        Bullet.add_safelist(type: :n_plus_one_query, class_name: 'Klass', association: :department)
+        Bullet.delete_safelist(type: :n_plus_one_query, class_name: 'Klass', association: :department)
+        expect(Bullet.safelist[:n_plus_one_query]).to eq({})
       end
     end
     context 'when exists multiple definitions' do
-      it 'is deleted from the whitelist successfully' do
-        Bullet.add_whitelist(type: :n_plus_one_query, class_name: 'Klass', association: :department)
-        Bullet.add_whitelist(type: :n_plus_one_query, class_name: 'Klass', association: :team)
-        Bullet.delete_whitelist(type: :n_plus_one_query, class_name: 'Klass', association: :team)
-        expect(Bullet.get_whitelist_associations(:n_plus_one_query, 'Klass')).to include :department
-        expect(Bullet.get_whitelist_associations(:n_plus_one_query, 'Klass')).to_not include :team
+      it 'is deleted from the safelist successfully' do
+        Bullet.add_safelist(type: :n_plus_one_query, class_name: 'Klass', association: :department)
+        Bullet.add_safelist(type: :n_plus_one_query, class_name: 'Klass', association: :team)
+        Bullet.delete_safelist(type: :n_plus_one_query, class_name: 'Klass', association: :team)
+        expect(Bullet.get_safelist_associations(:n_plus_one_query, 'Klass')).to include :department
+        expect(Bullet.get_safelist_associations(:n_plus_one_query, 'Klass')).to_not include :team
       end
     end
   end

data/spec/integration/active_record/association_spec.rb CHANGED Viewed

@@ -129,7 +129,7 @@ if active_record?
         expect(Bullet::Detector::Association).to be_completely_preloading_associations
       end
-      it 'should detect unused preload with post => commnets, no category => posts' do
+      it 'should detect unused preload with post => comments, no category => posts' do
         Category.includes(posts: :comments).each { |category| category.posts.map(&:name) }
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).to be_unused_preload_associations_for(Post, :comments)
@@ -202,7 +202,7 @@ if active_record?
         expect(Bullet::Detector::Association).to be_completely_preloading_associations
       end
-      it 'should detect preload with post => commnets' do
+      it 'should detect preload with post => comments' do
         Post.first.comments.map(&:name)
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
@@ -377,8 +377,7 @@ if active_record?
       it 'should detect unused preload with comment => author' do
         Comment.includes([:author, { post: :writer }]).where(['base_users.id = ?', BaseUser.first]).references(
           :base_users
-        )
-          .each { |comment| comment.post.writer.name }
+        ).each { |comment| comment.post.writer.name }
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
@@ -402,6 +401,15 @@ if active_record?
   end
   describe Bullet::Detector::Association, 'has_and_belongs_to_many' do
+    context 'posts <=> deals' do
+      it 'should detect preload associations with join tables that have identifier' do
+        Post.includes(:deals).each { |post| post.deals.map(&:name) }
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
+      end
+    end
     context 'students <=> teachers' do
       it 'should detect non preload associations' do
         Student.all.each { |student| student.teachers.map(&:name) }
@@ -443,6 +451,16 @@ if active_record?
         expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Student, :teachers)
       end
     end
+    context 'user => roles' do
+      it 'should detect preload associations' do
+        User.first.roles.includes(:resource).each { |role| role.resource }
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
+      end
+    end
   end
   describe Bullet::Detector::Association, 'has_many :through' do
@@ -456,7 +474,15 @@ if active_record?
       end
       it 'should detect preload associations' do
-        Firm.includes(:clients).each { |firm| firm.clients.map(&:name) }
+        Firm.preload(:clients).each { |firm| firm.clients.map(&:name) }
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
+      end
+      it 'should detect eager load association' do
+        Firm.eager_load(:clients).each { |firm| firm.clients.map(&:name) }
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
@@ -562,6 +588,42 @@ if active_record?
     end
   end
+  describe Bullet::Detector::Association, 'has_one :through' do
+    context 'user => attachment' do
+      it 'should detect non preload associations' do
+        User.all.each { |user| user.submission_attachment.file_name }
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+        expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(User, :submission_attachment)
+      end
+      it 'should detect preload associations' do
+        User.includes(:submission_attachment).each { |user| user.submission_attachment.file_name }
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
+      end
+      it 'should not detect preload associations' do
+        User.all.map(&:name)
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
+      end
+      it 'should detect unused preload associations' do
+        User.includes(:submission_attachment).map(&:name)
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).to be_unused_preload_associations_for(User, :submission_attachment)
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
+      end
+    end
+  end
   describe Bullet::Detector::Association, 'call one association that in possible objects' do
     it 'should not detect preload association' do
       Post.all
@@ -694,9 +756,9 @@ if active_record?
       end
     end
-    context 'whitelist n plus one query' do
-      before { Bullet.add_whitelist type: :n_plus_one_query, class_name: 'Post', association: :comments }
-      after { Bullet.clear_whitelist }
+    context 'add n plus one query to safelist' do
+      before { Bullet.add_safelist type: :n_plus_one_query, class_name: 'Post', association: :comments }
+      after { Bullet.clear_safelist }
       it 'should not detect n plus one query' do
         Post.all.each { |post| post.comments.map(&:name) }
@@ -715,9 +777,9 @@ if active_record?
       end
     end
-    context 'whitelist unused eager loading' do
-      before { Bullet.add_whitelist type: :unused_eager_loading, class_name: 'Post', association: :comments }
-      after { Bullet.clear_whitelist }
+    context 'add unused eager loading to safelist' do
+      before { Bullet.add_safelist type: :unused_eager_loading, class_name: 'Post', association: :comments }
+      after { Bullet.clear_safelist }
       it 'should not detect unused eager loading' do
         Post.includes(:comments).map(&:name)

data/spec/integration/counter_cache_spec.rb CHANGED Viewed

@@ -28,7 +28,7 @@ if !mongoid? && active_record?
       expect(Bullet.collected_counter_cache_notifications).to be_empty
     end
-    if active_record5? || active_record6?
+    if ActiveRecord::VERSION::MAJOR > 4
       it 'should not need counter cache for has_many through' do
         Client.all.each { |client| client.firms.size }
         expect(Bullet.collected_counter_cache_notifications).to be_empty
@@ -55,9 +55,9 @@ if !mongoid? && active_record?
       end
     end
-    context 'whitelist' do
-      before { Bullet.add_whitelist type: :counter_cache, class_name: 'Country', association: :cities }
-      after { Bullet.clear_whitelist }
+    context 'safelist' do
+      before { Bullet.add_safelist type: :counter_cache, class_name: 'Country', association: :cities }
+      after { Bullet.clear_safelist }
       it 'should not detect counter cache' do
         Country.all.each { |country| country.cities.size }

data/spec/integration/mongoid/association_spec.rb CHANGED Viewed

@@ -73,9 +73,9 @@ if mongoid?
           expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
           expect(Bullet::Detector::Association).not_to be_detecting_unpreloaded_association_for(
-                                                         Mongoid::Category,
-                                                         :posts
-                                                       )
+            Mongoid::Category,
+            :posts
+          )
           expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Mongoid::Category, :entries)
         end
@@ -118,7 +118,7 @@ if mongoid?
           expect(Bullet::Detector::Association).to be_completely_preloading_associations
         end
-        it 'should detect preload with post => commnets' do
+        it 'should detect preload with post => comments' do
           Mongoid::Post.first.comments.map(&:name)
           Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
           expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations

data/spec/models/attachment.rb ADDED Viewed

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+class Attachment < ActiveRecord::Base
+  belongs_to :submission
+end

data/spec/models/deal.rb ADDED Viewed

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+class Deal < ActiveRecord::Base
+  has_and_belongs_to_many :posts
+end

data/spec/models/folder.rb CHANGED Viewed

@@ -1,3 +1,4 @@
 # frozen_string_literal: true
-class Folder < Document; end
+class Folder < Document
+end

data/spec/models/group.rb CHANGED Viewed

@@ -1,3 +1,4 @@
 # frozen_string_literal: true
-class Group < ActiveRecord::Base; end
+class Group < ActiveRecord::Base
+end

data/spec/models/page.rb CHANGED Viewed

@@ -1,3 +1,4 @@
 # frozen_string_literal: true
-class Page < Document; end
+class Page < Document
+end

data/spec/models/post.rb CHANGED Viewed

@@ -4,6 +4,7 @@ class Post < ActiveRecord::Base
   belongs_to :category, inverse_of: :posts
   belongs_to :writer
   has_many :comments, inverse_of: :post
+  has_and_belongs_to_many :deals
   validates :category, presence: true
@@ -21,6 +22,7 @@ class Post < ActiveRecord::Base
     next unless trigger_after_save
     temp_comment = Comment.new(post: self)
     # this triggers self to be "possible", even though it's
     # not saved yet
     temp_comment.post

data/spec/models/role.rb ADDED Viewed

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+class Role < ActiveRecord::Base
+  has_and_belongs_to_many :users
+  belongs_to :resource, polymorphic: true
+end

data/spec/models/submission.rb CHANGED Viewed

@@ -3,4 +3,5 @@
 class Submission < ActiveRecord::Base
   belongs_to :user
   has_many :replies
+  has_one :attachment
 end

data/spec/models/user.rb CHANGED Viewed

@@ -2,5 +2,7 @@
 class User < ActiveRecord::Base
   has_one :submission
+  has_one :submission_attachment, through: :submission, source: :attachment, class_name: 'Attachment'
   belongs_to :category
+  has_and_belongs_to_many :roles
 end

data/spec/models/writer.rb CHANGED Viewed

@@ -1,3 +1,4 @@
 # frozen_string_literal: true
-class Writer < BaseUser; end
+class Writer < BaseUser
+end

data/spec/spec_helper.rb CHANGED Viewed

@@ -4,12 +4,10 @@ require 'rspec'
 begin
   require 'active_record'
 rescue LoadError
 end
 begin
   require 'mongoid'
 rescue LoadError
 end
 module Rails

data/spec/support/mongo_seed.rb CHANGED Viewed

@@ -45,6 +45,7 @@ module Support
         Mongoid.configure do |config|
           config.load_configuration(clients: { default: { database: 'bullet', hosts: %w[localhost:27017] } })
         end
         # Increase the level from DEBUG in order to avoid excessive logging to the screen
         Mongo::Logger.logger.level = Logger::WARN
       end

data/spec/support/sqlite_seed.rb CHANGED Viewed

@@ -21,6 +21,13 @@ module Support
       post2 = category2.posts.create(name: 'second', writer: writer2)
       post3 = category2.posts.create(name: 'third', writer: writer2)
+      deal1 = Deal.new(name: 'Deal 1')
+      deal1.posts << post1
+      deal1.posts << post2
+      deal2 = Deal.new(name: 'Deal 2')
+      post1.deals << deal1
+      post1.deals << deal2
       comment1 = post1.comments.create(name: 'first', author: writer1)
       comment2 = post1.comments.create(name: 'first2', author: writer1)
       comment3 = post1.comments.create(name: 'first3', author: writer1)
@@ -85,9 +92,16 @@ module Support
       page3 = Page.create(name: 'page3', parent_id: folder2.id, author_id: author2.id)
       page4 = Page.create(name: 'page4', parent_id: folder2.id, author_id: author2.id)
+      role1 = Role.create(name: 'Admin')
+      role2 = Role.create(name: 'User')
       user1 = User.create(name: 'user1', category: category1)
       user2 = User.create(name: 'user2', category: category1)
+      user1.roles << role1
+      user1.roles << role2
+      user2.roles << role2
       submission1 = user1.create_submission(name: 'submission1')
       submission2 = user2.create_submission(name: 'submission2')
@@ -95,6 +109,9 @@ module Support
       submission1.replies.create(name: 'reply2')
       submission2.replies.create(name: 'reply3')
       submission2.replies.create(name: 'reply4')
+      submission1.create_attachment(file_name: 'submission1 file')
+      submission2.create_attachment(file_name: 'submission2 file')
     end
     def setup_db
@@ -153,6 +170,11 @@ module Support
           t.column :hotel_id, :integer
         end
+        create_table :deals_posts do |t|
+          t.column :deal_id, :integer
+          t.column :post_id, :integer
+        end
         create_table :documents do |t|
           t.string :name
           t.string :type
@@ -231,6 +253,17 @@ module Support
           t.column :submission_id, :integer
         end
+        create_table :roles do |t|
+          t.column :name, :string
+          t.column :resource_id, :integer
+          t.column :resource_type, :string
+        end
+        create_table :roles_users do |t|
+          t.column :role_id, :integer
+          t.column :user_id, :integer
+        end
         create_table :submissions do |t|
           t.column :name, :string
           t.column :user_id, :integer
@@ -240,6 +273,11 @@ module Support
           t.column :name, :string
           t.column :category_id, :integer
         end
+        create_table :attachments do |t|
+          t.column :file_name, :string
+          t.column :submission_id, :integer
+        end
       end
     end
   end

data/test.sh CHANGED Viewed

@@ -1,5 +1,7 @@
 #bundle update rails && bundle exec rspec spec
 #BUNDLE_GEMFILE=Gemfile.mongoid bundle update mongoid && BUNDLE_GEMFILE=Gemfile.mongoid bundle exec rspec spec
+BUNDLE_GEMFILE=Gemfile.rails-7.0 bundle && BUNDLE_GEMFILE=Gemfile.rails-7.0 bundle exec rspec spec
+BUNDLE_GEMFILE=Gemfile.rails-6.1 bundle && BUNDLE_GEMFILE=Gemfile.rails-6.1 bundle exec rspec spec
 BUNDLE_GEMFILE=Gemfile.rails-6.0 bundle && BUNDLE_GEMFILE=Gemfile.rails-6.0 bundle exec rspec spec
 BUNDLE_GEMFILE=Gemfile.rails-5.2 bundle && BUNDLE_GEMFILE=Gemfile.rails-5.2 bundle exec rspec spec
 BUNDLE_GEMFILE=Gemfile.rails-5.1 bundle && BUNDLE_GEMFILE=Gemfile.rails-5.1 bundle exec rspec spec