summaryrefslogtreecommitdiff
path: root/spec/policies
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2017-11-07 22:12:19 +0900
committerShinya Maeda <shinya@gitlab.com>2017-11-07 22:12:19 +0900
commitd89c18901bde510da2668e676b3bf2f1e21deef2 (patch)
tree57ddcc05bb1ca0d70bfb827d0e1ef4930c7ebf7b /spec/policies
parentafef38533727cf32a7be324243a25b4db5eb5498 (diff)
parent666ab4882f2c6d385c04afe269ddf5b11f795b19 (diff)
downloadgitlab-ce-d89c18901bde510da2668e676b3bf2f1e21deef2.tar.gz
Merge branch 'master' into fix/sm/31771-do-not-allow-jobs-to-be-erased-new
Diffstat (limited to 'spec/policies')
-rw-r--r--spec/policies/clusters/cluster_policy_spec.rb (renamed from spec/policies/gcp/cluster_policy_spec.rb)6
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/policies/gcp/cluster_policy_spec.rb b/spec/policies/clusters/cluster_policy_spec.rb
index e213aa3d557..4207f42b07f 100644
--- a/spec/policies/gcp/cluster_policy_spec.rb
+++ b/spec/policies/clusters/cluster_policy_spec.rb
@@ -1,8 +1,8 @@
require 'spec_helper'
-describe Gcp::ClusterPolicy, :models do
- set(:project) { create(:project) }
- set(:cluster) { create(:gcp_cluster, project: project) }
+describe Clusters::ClusterPolicy, :models do
+ let(:cluster) { create(:cluster, :project) }
+ let(:project) { cluster.project }
let(:user) { create(:user) }
let(:policy) { described_class.new(user, cluster) }