Merge pull request #8653 from vpereira/mbranch_dryrun_issue

Make sure that possible_package isn't nil

src/api/app/models/branch_package/lookup_incident_package.rb

@@ -13,7 +13,7 @@ def package
     end.flatten
     pkg = nil
     # choose the last one based on the incident number (incremental sequence)
-    possible_packages.each do |possible_package|
+    possible_packages.reject(&:nil?).each do |possible_package|
       pkg = possible_package if pkg.nil? || possible_package.project.incident_id > pkg.project.incident_id
     end
     pkg

src/api/spec/models/branch_package/lookup_incident_package_spec.rb

@@ -78,5 +78,13 @@
     subject { lookup_incident_package.package }
 
     it { expect(subject).to eq(package_1) }
+
+    context 'possible packages are nil' do
+      before do
+        allow_any_instance_of(BranchPackage::LookupIncidentPackage).to receive(:possible_packages).and_return([[package_1], [nil]])
+      end
+
+      it { expect(subject).to eq(package_1) }
+    end
   end
 end