Resolve `migrate_gcp_clusters_to_new_clusters_architectures_spec.rb`

[skip-ci]

Resolve `migrate_gcp_clusters_to_new_clusters_architectures_spec.rb`
[skip-ci]
e61fee3b · Bob Van Landuyt · 042330c7 · e61fee3b
Commit e61fee3b authored Dec 06, 2017 by Bob Van Landuyt
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 10 deletions

spec/migrations/migrate_gcp_clusters_to_new_clusters_architectures_spec.rb ...igrate_gcp_clusters_to_new_clusters_architectures_spec.rb +0 -10

No files found.
--- a/spec/migrations/migrate_gcp_clusters_to_new_clusters_architectures_spec.rb
+++ b/spec/migrations/migrate_gcp_clusters_to_new_clusters_architectures_spec.rb
@@ -57,12 +57,7 @@ describe MigrateGcpClustersToNewClustersArchitectures, :migration do
      expect(cluster.provider_type).to eq('gcp')
      expect(cluster.platform_type).to eq('kubernetes')

-<<<<<<< HEAD
      expect(cluster.project_ids).to include(project.id)
-=======
-      expect(cluster.project).to eq(project)
-      expect(project.clusters).to include(cluster)
->>>>>>> upstream/master

      expect(cluster.provider_gcp.cluster).to eq(cluster)
      expect(cluster.provider_gcp.status).to eq(status)
@@ -138,12 +133,7 @@ describe MigrateGcpClustersToNewClustersArchitectures, :migration do
      expect(cluster.provider_type).to eq('gcp')
      expect(cluster.platform_type).to eq('kubernetes')

-<<<<<<< HEAD
      expect(cluster.project_ids).to include(project.id)
-=======
-      expect(cluster.project).to eq(project)
-      expect(project.clusters).to include(cluster)
->>>>>>> upstream/master

      expect(cluster.provider_gcp.cluster).to eq(cluster)
      expect(cluster.provider_gcp.status).to eq(status)