Try to fix namespaces (1)

spec/helpers/carto_db_spec.rb

@@ -1,16 +1,7 @@
+require 'spec_helper'
 require_relative '../simplecov_helper'
-require 'rails'
-require 'ostruct'
-require_relative '../../config/initializers/carto_db'
-
-# Just "open" the modules so that we make sure they are defined,
-#  but do not overwrite anything so that it doesn't affect other tests.
-module CartoDB
-  module Cartodb; end
-end
-
-describe 'CartoDB' do
 
+describe CartoDB do
   describe '#ip?' do
     it 'detects ips' do
       CartoDB.ip?(nil).should == false
@@ -27,7 +18,7 @@ describe 'CartoDB' do
 
   describe 'extract_subdomain' do
     it 'extracts subdomain without subdomainless_urls' do
-      CartoDB::Cartodb.stubs(:config).returns(subdomainless_urls: false)
+      Cartodb.stubs(:config).returns(subdomainless_urls: false)
       CartoDB.stubs(:session_domain).returns('.localhost.lan')
       CartoDB.extract_subdomain(OpenStruct.new(host: 'localhost.lan', params: { user_domain: '' })).should == ''
       CartoDB.extract_subdomain(OpenStruct.new(host: 'localhost.lan', params: { user_domain: nil })).should == ''
@@ -37,7 +28,7 @@ describe 'CartoDB' do
     end
 
     it 'extracts subdomain with subdomainless_urls' do
-      CartoDB::Cartodb.stubs(:config).returns(subdomainless_urls: true)
+      Cartodb.stubs(:config).returns(subdomainless_urls: true)
       CartoDB.stubs(:session_domain).returns('localhost.lan')
 
       CartoDB.extract_subdomain(OpenStruct.new(host: 'localhost.lan', params: { user_domain: '' })).should == ''