Make sure OAuth routes we generate for Geo are the same in Rails routes

config/routes.rb

@@ -53,7 +53,7 @@ Rails.application.routes.draw do
                 authorizations: 'oauth/authorizations'
   end
 
-  namespace :oauth, path: 'geo', controller: 'geo_auth', as: 'oauth_geo' do
+  namespace :oauth, path: 'oauth/geo', controller: 'geo_auth', as: 'oauth_geo' do
     get 'auth'
     get 'callback'
     get 'logout'

spec/lib/gitlab/geo/oauth_session_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Gitlab::Geo::OauthSession do
   subject { described_class.new }
   let(:oauth_app) { FactoryGirl.create(:doorkeeper_application) }
-  let(:oauth_return_to) { 'http://localhost:3000/oath/geo/callback' }
+  let(:oauth_return_to) { 'http://localhost:3000/oauth/geo/callback' }
   let(:dummy_state) { 'salt:hmac:return_to' }
   let(:valid_state) { described_class.new(return_to: oauth_return_to).generate_oauth_state }
   let(:access_token) { FactoryGirl.create(:doorkeeper_access_token).token }

spec/models/geo_node_spec.rb

@@ -8,6 +8,7 @@ describe GeoNode, type: :model do
   subject(:node) { FactoryGirl.create(:geo_node) }
 
   let(:dummy_url) { 'https://localhost:3000/gitlab' }
+  let(:url_helpers) { Gitlab::Application.routes.url_helpers }
 
   context 'associations' do
     it { is_expected.to belong_to(:geo_node_key).dependent(:destroy) }
@@ -186,6 +187,25 @@ describe GeoNode, type: :model do
     it 'returns oauth callback url based on node uri' do
       expect(new_node.oauth_callback_url).to eq(oauth_callback_url)
     end
+
+    it 'returns url that matches rails url_helpers generated one' do
+      route = url_helpers.oauth_geo_callback_url(protocol: 'https:', host: 'localhost', port: 3000, script_name: '/gitlab')
+      expect(new_node.oauth_callback_url).to eq(route)
+    end
+  end
+
+  describe '#oauth_logout_url' do
+    let(:fake_state) { URI.encode('fakestate') }
+    let(:oauth_logout_url) { "https://localhost:3000/gitlab/oauth/geo/logout?state=#{fake_state}" }
+
+    it 'returns oauth logout url based on node uri' do
+      expect(new_node.oauth_logout_url(fake_state)).to eq(oauth_logout_url)
+    end
+
+    it 'returns url that matches rails url_helpers generated one' do
+      route = url_helpers.oauth_geo_logout_url(protocol: 'https:', host: 'localhost', port: 3000, script_name: '/gitlab', state: fake_state)
+      expect(new_node.oauth_logout_url(fake_state)).to eq(route)
+    end
   end
 
   describe '#missing_oauth_application?' do