Merge branch...

Merge branch '6659-extract-ee-specific-files-lines-for-spec-lib-gitlab-easier-ones-ce' into 'master'

Update usage_data_spec to match EE

See merge request gitlab-org/gitlab-ce!28219

spec/lib/gitlab/usage_data_spec.rb

@@ -35,7 +35,7 @@ describe Gitlab::UsageData do
     subject { described_class.data }
     it "gathers usage data" do
-      expect(subject.keys).to match_array(%i(
+      expect(subject.keys).to include(*%i(
         active_user_count
         counts
         recorded_at
@@ -68,7 +68,7 @@ describe Gitlab::UsageData do
       expect(count_data[:boards]).to eq(1)
       expect(count_data[:projects]).to eq(3)
-      expect(count_data.keys).to match_array(%i(
+      expect(count_data.keys).to include(*%i(
         assignee_lists
         boards
         ci_builds