Merge pull request #13039 from isimluk/remove-consumption-admin

Remove default consumption admin user
ManageIQ · Dec 8, 2016 · ab987fc · ab987fc
2 parents a495372 + db5b999
commit ab987fc
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/db/fixtures/users.yml b/db/fixtures/users.yml
@@ -3,7 +3,3 @@
   :userid: admin
   :password: smartvm
   :group: EvmGroup-super_administrator
-- :name: Consumption Administrator
-  :userid: consumption_admin
-  :password: smartvm
-  :group: EvmGroup-consumption_administrator
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
@@ -364,7 +364,7 @@
   end
 
   context ".seed" do
-    include_examples(".seed called multiple times", 2)
+    include_examples(".seed called multiple times", 1)
 
     include_examples("seeding users with", [])
 

diff --git a/spec/support/examples_group/shared_examples_for_seeding.rb b/spec/support/examples_group/shared_examples_for_seeding.rb
@@ -6,7 +6,7 @@
 end
 
 shared_examples_for "seeding users with" do |klasses|
-  let(:users) { {"admin" => "super_administrator", "consumption_admin" => "consumption_administrator"} }
+  let(:users) { {'admin' => 'super_administrator' } }
 
   it "seeds users #{klasses.present? ? 'with' : ''} #{klasses.collect(&:to_s).join(', ')}" do
     klasses.push(User)