Fix specs for GeoNode

app/models/geo_node.rb

@@ -33,7 +33,7 @@ class GeoNode < ActiveRecord::Base
 
   def uri
     if relative_url_root
-      relative_url = relative_url_root.starts_with?('/') ? relative_url_root : relative_url_root.prepend('/')
+      relative_url = relative_url_root.starts_with?('/') ? relative_url_root : "/#{relative_url_root}"
     end
 
     URI.parse(URI::Generic.build(scheme: schema, host: host, port: port, path: relative_url).normalize.to_s)
@@ -59,9 +59,9 @@ class GeoNode < ActiveRecord::Base
 
   def refresh_bulk_notify_worker_status
     if Gitlab::Geo.primary?
-      Gitlab::Geo.bulk_notify_job.enable!
+      Gitlab::Geo.bulk_notify_job.try(:enable!)
     else
-      Gitlab::Geo.bulk_notify_job.disable!
+      Gitlab::Geo.bulk_notify_job.try(:disable!)
     end
   end
 

spec/factories.rb

@@ -116,6 +116,12 @@ FactoryGirl.define do
     end
 
     factory :geo_node_key, class: 'GeoNodeKey' do
+      trait :another_key do
+        key do
+          "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDmTillFzNTrrGgwaCKaSj+QCz81E6jBc/s9av0+3b1Hwfxgkqjl4nAK/OD2NjgyrONDTDfR8cRN4eAAy6nY8GLkOyYBDyuc5nTMqs5z3yVuTwf3koGm/YQQCmo91psZ2BgDFTor8SVEE5Mm1D1k3JDMhDFxzzrOtRYFPci9lskTJaBjpqWZ4E9rDTD2q/QZntCqbC3wE9uSemRQB5f8kik7vD/AD8VQXuzKladrZKkzkONCPWsXDspUitjM8HkQdOf0PsYn1CMUC1xKYbCxkg5TkEosIwGv6CoEArUrdu/4+10LVslq494mAvEItywzrluCLCnwELfW+h/m8UHoVhZ"
+        end
+      end
+
     end
 
     factory :personal_key do
@@ -230,4 +236,16 @@ FactoryGirl.define do
     noteable factory: :issue
     reply_key "0123456789abcdef" * 2
   end
+
+  factory :geo_node do
+    host { Gitlab.config.gitlab.host }
+    sequence(:port) {|n| n}
+    association :geo_node_key
+
+    trait :primary do
+      primary true
+      port { Gitlab.config.gitlab.port }
+      association :geo_node_key, :another_key
+    end
+  end
 end