Merge branch 'feature/event-maps' into 'master'
Feature/event maps See merge request framasoft/mobilizon!105
This commit is contained in:
@@ -7,23 +7,23 @@ defmodule Mobilizon.AddressesTest do
|
||||
alias Mobilizon.Addresses.Address
|
||||
|
||||
@valid_attrs %{
|
||||
addressCountry: "some addressCountry",
|
||||
addressLocality: "some addressLocality",
|
||||
addressRegion: "some addressRegion",
|
||||
country: "some addressCountry",
|
||||
locality: "some addressLocality",
|
||||
region: "some addressRegion",
|
||||
description: "some description",
|
||||
floor: "some floor",
|
||||
postalCode: "some postalCode",
|
||||
streetAddress: "some streetAddress",
|
||||
postal_code: "some postalCode",
|
||||
street: "some streetAddress",
|
||||
geom: %Geo.Point{coordinates: {10, -10}, srid: 4326}
|
||||
}
|
||||
@update_attrs %{
|
||||
addressCountry: "some updated addressCountry",
|
||||
addressLocality: "some updated addressLocality",
|
||||
addressRegion: "some updated addressRegion",
|
||||
country: "some updated addressCountry",
|
||||
locality: "some updated addressLocality",
|
||||
region: "some updated addressRegion",
|
||||
description: "some updated description",
|
||||
floor: "some updated floor",
|
||||
postalCode: "some updated postalCode",
|
||||
streetAddress: "some updated streetAddress",
|
||||
postal_code: "some updated postalCode",
|
||||
street: "some updated streetAddress",
|
||||
geom: %Geo.Point{coordinates: {20, -20}, srid: 4326}
|
||||
}
|
||||
# @invalid_attrs %{
|
||||
@@ -58,25 +58,25 @@ defmodule Mobilizon.AddressesTest do
|
||||
|
||||
test "create_address/1 with valid data creates a address" do
|
||||
assert {:ok, %Address{} = address} = Addresses.create_address(@valid_attrs)
|
||||
assert address.addressCountry == "some addressCountry"
|
||||
assert address.addressLocality == "some addressLocality"
|
||||
assert address.addressRegion == "some addressRegion"
|
||||
assert address.country == "some addressCountry"
|
||||
assert address.locality == "some addressLocality"
|
||||
assert address.region == "some addressRegion"
|
||||
assert address.description == "some description"
|
||||
assert address.floor == "some floor"
|
||||
assert address.postalCode == "some postalCode"
|
||||
assert address.streetAddress == "some streetAddress"
|
||||
assert address.postal_code == "some postalCode"
|
||||
assert address.street == "some streetAddress"
|
||||
end
|
||||
|
||||
test "update_address/2 with valid data updates the address" do
|
||||
address = address_fixture()
|
||||
assert {:ok, %Address{} = address} = Addresses.update_address(address, @update_attrs)
|
||||
assert address.addressCountry == "some updated addressCountry"
|
||||
assert address.addressLocality == "some updated addressLocality"
|
||||
assert address.addressRegion == "some updated addressRegion"
|
||||
assert address.country == "some updated addressCountry"
|
||||
assert address.locality == "some updated addressLocality"
|
||||
assert address.region == "some updated addressRegion"
|
||||
assert address.description == "some updated description"
|
||||
assert address.floor == "some updated floor"
|
||||
assert address.postalCode == "some updated postalCode"
|
||||
assert address.streetAddress == "some updated streetAddress"
|
||||
assert address.postal_code == "some updated postalCode"
|
||||
assert address.street == "some updated streetAddress"
|
||||
end
|
||||
|
||||
test "delete_address/1 deletes the address" do
|
||||
|
||||
@@ -35,10 +35,10 @@ defmodule Mobilizon.Service.Geospatial.AddokTest do
|
||||
test "returns a valid address from search" do
|
||||
use_cassette "geospatial/addok/search" do
|
||||
assert %Address{
|
||||
addressLocality: "Lyon",
|
||||
locality: "Lyon",
|
||||
description: "10 Rue Jangot",
|
||||
postalCode: "69007",
|
||||
streetAddress: "10 Rue Jangot",
|
||||
postal_code: "69007",
|
||||
street: "10 Rue Jangot",
|
||||
geom: %Geo.Point{coordinates: {4.842569, 45.751718}, properties: %{}, srid: 4326}
|
||||
} == Addok.search("10 rue Jangot") |> hd
|
||||
end
|
||||
@@ -47,10 +47,10 @@ defmodule Mobilizon.Service.Geospatial.AddokTest do
|
||||
test "returns a valid address from reverse geocode" do
|
||||
use_cassette "geospatial/addok/geocode" do
|
||||
assert %Address{
|
||||
addressLocality: "Lyon",
|
||||
locality: "Lyon",
|
||||
description: "10 Rue Jangot",
|
||||
postalCode: "69007",
|
||||
streetAddress: "10 Rue Jangot",
|
||||
postal_code: "69007",
|
||||
street: "10 Rue Jangot",
|
||||
geom: %Geo.Point{coordinates: {4.842569, 45.751718}, properties: %{}, srid: 4326}
|
||||
} == Addok.geocode(4.842569, 45.751718) |> hd
|
||||
end
|
||||
|
||||
@@ -42,12 +42,12 @@ defmodule Mobilizon.Service.Geospatial.GoogleMapsTest do
|
||||
test "returns a valid address from search" do
|
||||
use_cassette "geospatial/google_maps/search" do
|
||||
assert %Address{
|
||||
addressLocality: "Lyon",
|
||||
locality: "Lyon",
|
||||
description: "10 Rue Jangot, 69007 Lyon, France",
|
||||
addressRegion: "Auvergne-Rhône-Alpes",
|
||||
addressCountry: "France",
|
||||
postalCode: "69007",
|
||||
streetAddress: "10 Rue Jangot",
|
||||
region: "Auvergne-Rhône-Alpes",
|
||||
country: "France",
|
||||
postal_code: "69007",
|
||||
street: "10 Rue Jangot",
|
||||
geom: %Geo.Point{
|
||||
coordinates: {4.8424032, 45.75164940000001},
|
||||
properties: %{},
|
||||
@@ -60,12 +60,12 @@ defmodule Mobilizon.Service.Geospatial.GoogleMapsTest do
|
||||
test "returns a valid address from reverse geocode" do
|
||||
use_cassette "geospatial/google_maps/geocode" do
|
||||
assert %Address{
|
||||
addressLocality: "Lyon",
|
||||
locality: "Lyon",
|
||||
description: "10 Rue Jangot, 69007 Lyon, France",
|
||||
addressRegion: "Auvergne-Rhône-Alpes",
|
||||
addressCountry: "France",
|
||||
postalCode: "69007",
|
||||
streetAddress: "10 Rue Jangot",
|
||||
region: "Auvergne-Rhône-Alpes",
|
||||
country: "France",
|
||||
postal_code: "69007",
|
||||
street: "10 Rue Jangot",
|
||||
geom: %Geo.Point{
|
||||
coordinates: {4.8424967, 45.751725},
|
||||
properties: %{},
|
||||
|
||||
@@ -45,12 +45,12 @@ defmodule Mobilizon.Service.Geospatial.MapQuestTest do
|
||||
test "returns a valid address from search" do
|
||||
use_cassette "geospatial/map_quest/search" do
|
||||
assert %Address{
|
||||
addressLocality: "Lyon",
|
||||
locality: "Lyon",
|
||||
description: "10 Rue Jangot",
|
||||
addressRegion: "Auvergne-Rhône-Alpes",
|
||||
addressCountry: "FR",
|
||||
postalCode: "69007",
|
||||
streetAddress: "10 Rue Jangot",
|
||||
region: "Auvergne-Rhône-Alpes",
|
||||
country: "FR",
|
||||
postal_code: "69007",
|
||||
street: "10 Rue Jangot",
|
||||
geom: %Geo.Point{
|
||||
coordinates: {4.842566, 45.751714},
|
||||
properties: %{},
|
||||
@@ -65,12 +65,12 @@ defmodule Mobilizon.Service.Geospatial.MapQuestTest do
|
||||
test "returns a valid address from reverse geocode" do
|
||||
use_cassette "geospatial/map_quest/geocode" do
|
||||
assert %Address{
|
||||
addressLocality: "Lyon",
|
||||
locality: "Lyon",
|
||||
description: "10 Rue Jangot",
|
||||
addressRegion: "Auvergne-Rhône-Alpes",
|
||||
addressCountry: "FR",
|
||||
postalCode: "69007",
|
||||
streetAddress: "10 Rue Jangot",
|
||||
region: "Auvergne-Rhône-Alpes",
|
||||
country: "FR",
|
||||
postal_code: "69007",
|
||||
street: "10 Rue Jangot",
|
||||
geom: %Geo.Point{
|
||||
coordinates: {4.842569, 45.751718},
|
||||
properties: %{},
|
||||
|
||||
@@ -28,13 +28,13 @@ defmodule Mobilizon.Service.Geospatial.NominatimTest do
|
||||
test "returns a valid address from search" do
|
||||
use_cassette "geospatial/nominatim/search" do
|
||||
assert %Address{
|
||||
addressLocality: "Lyon",
|
||||
locality: "Lyon",
|
||||
description:
|
||||
"10, Rue Jangot, La Guillotière, Lyon 7e Arrondissement, Lyon, Métropole de Lyon, Departemental constituency of Rhône, Auvergne-Rhône-Alpes, Metropolitan France, 69007, France",
|
||||
addressRegion: "Auvergne-Rhône-Alpes",
|
||||
addressCountry: "France",
|
||||
postalCode: "69007",
|
||||
streetAddress: "10 Rue Jangot",
|
||||
region: "Auvergne-Rhône-Alpes",
|
||||
country: "France",
|
||||
postal_code: "69007",
|
||||
street: "10 Rue Jangot",
|
||||
geom: %Geo.Point{
|
||||
coordinates: {4.8425657, 45.7517141},
|
||||
properties: %{},
|
||||
@@ -47,13 +47,13 @@ defmodule Mobilizon.Service.Geospatial.NominatimTest do
|
||||
test "returns a valid address from reverse geocode" do
|
||||
use_cassette "geospatial/nominatim/geocode" do
|
||||
assert %Address{
|
||||
addressLocality: "Lyon",
|
||||
locality: "Lyon",
|
||||
description:
|
||||
"10, Rue Jangot, La Guillotière, Lyon 7e Arrondissement, Lyon, Métropole de Lyon, Circonscription départementale du Rhône, Auvergne-Rhône-Alpes, France métropolitaine, 69007, France",
|
||||
addressRegion: "Auvergne-Rhône-Alpes",
|
||||
addressCountry: "France",
|
||||
postalCode: "69007",
|
||||
streetAddress: "10 Rue Jangot",
|
||||
region: "Auvergne-Rhône-Alpes",
|
||||
country: "France",
|
||||
postal_code: "69007",
|
||||
street: "10 Rue Jangot",
|
||||
geom: %Geo.Point{
|
||||
coordinates: {4.8425657, 45.7517141},
|
||||
properties: %{},
|
||||
|
||||
@@ -26,12 +26,12 @@ defmodule Mobilizon.Service.Geospatial.PhotonTest do
|
||||
test "returns a valid address from search" do
|
||||
use_cassette "geospatial/photon/search" do
|
||||
assert %Address{
|
||||
addressLocality: "Lyon",
|
||||
locality: "Lyon",
|
||||
description: "10 Rue Jangot",
|
||||
addressRegion: "Auvergne-Rhône-Alpes",
|
||||
addressCountry: "France",
|
||||
postalCode: "69007",
|
||||
streetAddress: "10 Rue Jangot",
|
||||
region: "Auvergne-Rhône-Alpes",
|
||||
country: "France",
|
||||
postal_code: "69007",
|
||||
street: "10 Rue Jangot",
|
||||
geom: %Geo.Point{
|
||||
coordinates: {4.8425657, 45.7517141},
|
||||
properties: %{},
|
||||
@@ -45,12 +45,12 @@ defmodule Mobilizon.Service.Geospatial.PhotonTest do
|
||||
# test "returns a valid address from reverse geocode" do
|
||||
# use_cassette "geospatial/photon/geocode" do
|
||||
# assert %Address{
|
||||
# addressLocality: "Lyon",
|
||||
# locality: "Lyon",
|
||||
# description: "",
|
||||
# addressRegion: "Auvergne-Rhône-Alpes",
|
||||
# addressCountry: "France",
|
||||
# postalCode: "69007",
|
||||
# streetAddress: "10 Rue Jangot",
|
||||
# region: "Auvergne-Rhône-Alpes",
|
||||
# country: "France",
|
||||
# postal_code: "69007",
|
||||
# street: "10 Rue Jangot",
|
||||
# geom: %Geo.Point{
|
||||
# coordinates: {4.8425657, 45.7517141},
|
||||
# properties: %{},
|
||||
|
||||
@@ -10,6 +10,7 @@ defmodule MobilizonWeb.Resolvers.AddressResolverTest do
|
||||
query = """
|
||||
{
|
||||
searchAddress(query: "10 Rue Jangot") {
|
||||
street,
|
||||
description,
|
||||
geom
|
||||
}
|
||||
|
||||
@@ -72,11 +72,11 @@ defmodule Mobilizon.Factory do
|
||||
description: sequence("MyAddress"),
|
||||
geom: %Geo.Point{coordinates: {45.75, 4.85}, srid: 4326},
|
||||
floor: "Myfloor",
|
||||
addressCountry: "My Country",
|
||||
addressLocality: "My Locality",
|
||||
addressRegion: "My Region",
|
||||
postalCode: "My Postal Code",
|
||||
streetAddress: "My Street Address"
|
||||
country: "My Country",
|
||||
locality: "My Locality",
|
||||
region: "My Region",
|
||||
postal_code: "My Postal Code",
|
||||
street: "My Street Address"
|
||||
}
|
||||
end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user