Merge commit 'd20d04922672ed016029c40ed64798f341ebca91' into glitch-soc/merge-upstream

spec/requests/api/v1/admin/reports_spec.rb

@@ -78,6 +78,17 @@ RSpec.describe 'Reports' do
         end
       end
 
+      context 'with both resolved and unresolved params' do
+        let(:params) { { resolved: true, unresolved: true } }
+        let(:scope)  { Report.all }
+
+        it 'returns all reports' do
+          subject
+
+          expect(response.parsed_body).to match_array(expected_response)
+        end
+      end
+
       context 'with account_id param' do
         let(:params) { { account_id: reporter.id } }
         let(:scope)  { Report.unresolved.where(account: reporter) }

spec/system/unlogged_spec.rb

@@ -12,6 +12,6 @@ RSpec.describe 'UnloggedBrowsing', :js, :streaming do
   it 'loads the home page' do
     expect(subject).to have_css('div.app-holder')
 
-    expect(subject).to have_css('div.columns-area__panels__main')
+    expect(subject).to have_css('main.columns-area__panels__main')
   end
 end