Merge branch 'fix-flaky-tests' into 'master'

Fix a flaky time expectation and a flaky ordering-related expectation

See merge request gitlab-org/gitlab!69450

spec/finders/error_tracking/errors_finder_spec.rb

@@ -6,7 +6,7 @@ RSpec.describe ErrorTracking::ErrorsFinder do
   let_it_be(:project) { create(:project) }
   let_it_be(:user) { project.creator }
   let_it_be(:error) { create(:error_tracking_error, project: project) }
-  let_it_be(:error_resolved) { create(:error_tracking_error, :resolved, project: project) }
+  let_it_be(:error_resolved) { create(:error_tracking_error, :resolved, project: project, first_seen_at: 2.hours.ago) }
   let_it_be(:error_yesterday) { create(:error_tracking_error, project: project, first_seen_at: Time.zone.now.yesterday) }
 
   before do
@@ -35,6 +35,7 @@ RSpec.describe ErrorTracking::ErrorsFinder do
     context 'with limit parameter' do
       let(:params) { { limit: '1', sort: 'first_seen' } }
 
+      # Sort by first_seen is DESC by default, so the most recent error is `error`
       it { is_expected.to contain_exactly(error) }
     end
   end

spec/requests/api/members_spec.rb

@@ -198,7 +198,7 @@ RSpec.describe API::Members do
 
               # Member attributes
               expect(json_response['access_level']).to eq(Member::DEVELOPER)
-              expect(json_response['created_at'].to_time).to be_like_time(developer.created_at)
+              expect(json_response['created_at'].to_time).to be_present
             end
           end
         end