Fix the columns order in vulnerability specs

Now select and group statements are taken into
account

ee/spec/graphql/resolvers/vulnerabilities_history_resolver_spec.rb

@@ -23,15 +23,15 @@ RSpec.describe Resolvers::VulnerabilitiesHistoryResolver do
         ordered_history = subject.sort_by { |count| [count['day'], count['severity']] }
 
         expect(ordered_history.to_json).to eq([
-          { 'id' => nil, 'severity' => 'critical', 'day' => '2019-10-16', 'count' => 1 },
-          { 'id' => nil, 'severity' => 'high', 'day' => '2019-10-16', 'count' => 1 },
-          { 'id' => nil, 'severity' => 'critical', 'day' => '2019-10-17', 'count' => 2 },
-          { 'id' => nil, 'severity' => 'high', 'day' => '2019-10-17', 'count' => 1 },
-          { 'id' => nil, 'severity' => 'critical', 'day' => '2019-10-18', 'count' => 2 },
-          { 'id' => nil, 'severity' => 'high', 'day' => '2019-10-18', 'count' => 1 },
-          { 'id' => nil, 'severity' => 'critical', 'day' => '2019-10-19', 'count' => 1 },
-          { 'id' => nil, 'severity' => 'high', 'day' => '2019-10-19', 'count' => 1 },
-          { 'id' => nil, 'severity' => 'critical', 'day' => '2019-10-20', 'count' => 1 }
+          { 'day' => '2019-10-16', 'severity' => 'critical', 'count' => 1, 'id' => nil },
+          { 'day' => '2019-10-16', 'severity' => 'high', 'count' => 1, 'id' => nil },
+          { 'day' => '2019-10-17', 'severity' => 'critical', 'count' => 2, 'id' => nil },
+          { 'day' => '2019-10-17', 'severity' => 'high', 'count' => 1, 'id' => nil },
+          { 'day' => '2019-10-18', 'severity' => 'critical', 'count' => 2, 'id' => nil },
+          { 'day' => '2019-10-18', 'severity' => 'high', 'count' => 1, 'id' => nil },
+          { 'day' => '2019-10-19', 'severity' => 'critical', 'count' => 1, 'id' => nil },
+          { 'day' => '2019-10-19', 'severity' => 'high', 'count' => 1, 'id' => nil },
+          { 'day' => '2019-10-20', 'severity' => 'critical', 'count' => 1, 'id' => nil }
         ].to_json)
       end
     end

ee/spec/models/ee/vulnerability_spec.rb

@@ -476,12 +476,12 @@ RSpec.describe Vulnerability do
       context 'when there are less than 10 days between the from and to dates' do
         it 'returns the count of unresolved, undismissed vulnerabilities for each severity for each day from the start date to the end date' do
           expect(counts_by_day_and_severity.order(:day, :severity).to_json).to eq([
-            { 'id' => nil, 'severity' => 'high', 'day' => '2019-10-26', 'count' => 1 },
-            { 'id' => nil, 'severity' => 'critical', 'day' => '2019-10-26', 'count' => 1 },
-            { 'id' => nil, 'severity' => 'high', 'day' => '2019-10-27', 'count' => 1 },
-            { 'id' => nil, 'severity' => 'critical', 'day' => '2019-10-27', 'count' => 2 },
-            { 'id' => nil, 'severity' => 'high', 'day' => '2019-10-28', 'count' => 1 },
-            { 'id' => nil, 'severity' => 'critical', 'day' => '2019-10-28', 'count' => 2 }
+            { 'day' => '2019-10-26', 'severity' => 'high', 'count' => 1, 'id' => nil },
+            { 'day' => '2019-10-26', 'severity' => 'critical', 'count' => 1, 'id' => nil },
+            { 'day' => '2019-10-27', 'severity' => 'high', 'count' => 1, 'id' => nil },
+            { 'day' => '2019-10-27', 'severity' => 'critical', 'count' => 2, 'id' => nil },
+            { 'day' => '2019-10-28', 'severity' => 'high', 'count' => 1, 'id' => nil },
+            { 'day' => '2019-10-28', 'severity' => 'critical', 'count' => 2, 'id' => nil }
           ].to_json)
         end
       end