Download as
Browse Code »

Commit ebc5cf242b3af6f634100040e4a06f5e7cf2d8db

Authored by Rafael Martins
1 parent da48ccac
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

GoogleMaps model updated to v3

Showing 3 changed files with 3 additions and 64 deletions   Show diff stats
app/models/google_maps.rb
  Diff comments   View file @ebc5cf2
1 1 class GoogleMaps
2 2  
3   - extend ActionView::Helpers::TagHelper
4   -
5   - class << self
6   -
7   - include ApplicationHelper
8   -
9   - def enabled?(domain)
10   - domain = Domain.find_by_name(domain)
11   - domain ? !domain.google_maps_key.nil? : false
12   - end
13   -
14   - def key(domainname)
15   - domain = Domain.find_by_name(domainname)
16   - domain && domain.google_maps_key || ''
17   - end
18   -
19   - def initial_zoom
20   - NOOSFERO_CONF['googlemaps_initial_zoom'] || 4
21   - end
22   -
23   - def api_url(domain)
24   - "http://maps.google.com/maps?file=api&amp;v=2&amp;key=#{key(domain)}"
25   - end
26   -
  3 + def self.initial_zoom
  4 + NOOSFERO_CONF['googlemaps_initial_zoom'] || 4
27 5 end
  6 +
28 7 end
... ...
test/unit/google_maps_test.rb
  Diff comments   View file @ebc5cf2
... ... @@ -2,25 +2,6 @@ require File.dirname(__FILE__) + &#39;/../test_helper&#39;
2 2  
3 3 class GoogleMapsTest < ActiveSupport::TestCase
4 4  
5   - def setup
6   - @domain = fast_create(Domain, :name => 'example-domain', :google_maps_key => 'DOMAIN_KEY')
7   - end
8   -
9   - attr_reader :domain
10   -
11   - should 'enable when key on domain is defined' do
12   - assert GoogleMaps.enabled?(domain.name)
13   - end
14   -
15   - should 'disable if key on domain is not defined' do
16   - fast_create(Domain, :name => 'domain-without-key')
17   - assert !GoogleMaps.enabled?('domain-without-key')
18   - end
19   -
20   - should 'point correctly to google maps' do
21   - assert_equal 'http://maps.google.com/maps?file=api&amp;v=2&amp;key=DOMAIN_KEY', GoogleMaps.api_url(domain.name)
22   - end
23   -
24 5 should 'provide initial_zoom setting' do
25 6 with_constants :NOOSFERO_CONF => {'googlemaps_initial_zoom' => 2} do
26 7 assert_equal 2, GoogleMaps.initial_zoom
... ... @@ -32,18 +13,4 @@ class GoogleMapsTest &lt; ActiveSupport::TestCase
32 13 assert_equal 4, GoogleMaps.initial_zoom
33 14 end
34 15  
35   - should 'have different keys to different domains' do
36   - other_domain = fast_create(Domain, :name => 'different-domain', :google_maps_key => 'DIFFERENT_DOMAIN_KEY')
37   -
38   - assert_equal 'http://maps.google.com/maps?file=api&amp;v=2&amp;key=DOMAIN_KEY', GoogleMaps.api_url(domain.name)
39   - assert_equal 'http://maps.google.com/maps?file=api&amp;v=2&amp;key=DIFFERENT_DOMAIN_KEY', GoogleMaps.api_url(other_domain.name)
40   - end
41   -
42   - should 'not crash without a domain' do
43   - Domain.delete_all
44   - assert_nothing_raised do
45   - GoogleMaps.key('example.com')
46   - end
47   - end
48   -
49 16 end
... ...
test/unit/location_block_test.rb
  Diff comments   View file @ebc5cf2
... ... @@ -18,13 +18,6 @@ class LocationBlockTest &lt; ActiveSupport::TestCase
18 18 assert_tag_in_string block.content, :tag => 'i'
19 19 end
20 20  
21   - should 'display localization map' do
22   - profile.lat = 0
23   - profile.lng = 0
24   - profile.save!
25   - assert_tag_in_string block.content, :tag => 'img'
26   - end
27   -
28 21 should 'be editable' do
29 22 assert LocationBlock.new.editable?
30 23 end
... ...