If a user can't be created, use the API user

theodi · Sep 12, 2014 · 82ce8f6 · 82ce8f6
1 parent cdb065e
commit 82ce8f6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/app/models/certificate_generator.rb b/app/models/certificate_generator.rb
@@ -109,17 +109,15 @@ def generate(create_user = false)
 
     response_set.autocomplete(request_dataset["documentationUrl"])
 
+    user = self.user
+
     if response_set.kitten_data && create_user === true
       email = response_set.kitten_data[:data][:publishers].first[:mbox] rescue nil
       if email
         user = User.find_or_create_by_email(email) do |user|
                   user.password = SecureRandom.base64
                end
-      else
-        user = User.find(ENV['ODC_ADMIN_IDS'].split(",").first)
-      end
-    else
-      user = self.user
+      end      
     end
 
     response_set.dataset.update_attribute(:user, user)

diff --git a/features/support/helper.rb b/features/support/helper.rb
@@ -7,7 +7,5 @@ def load_fixture(file)
 end
 
 Before do
-  user = User.create(email: "admin@example.com", password: "12345678")
-  ENV['ODC_ADMIN_IDS'] = user.id.to_s
   FactoryGirl.create(:survey, full_title:'UnitedKingdam', title:'GB', access_code: 'GB', survey_version: 1)
 end