diff --git a/app/views/organizations/show.html.erb b/app/views/organizations/show.html.erb
index d14dca13d..fb5eaee7c 100644
--- a/app/views/organizations/show.html.erb
+++ b/app/views/organizations/show.html.erb
@@ -106,4 +106,8 @@
<% if current_user %>
<%= render "shared/movements" %>
+<% else %>
+
+ <%= t ".join_timebank" %>
+
<% end %>
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 6d7aa4838..6087868ca 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -293,6 +293,7 @@ ca:
required_field: "* Camp obligatori"
save: Desar
search: Cercar
+ search_location: Cerca per localitat
show: Mostrar
source_destination: Origen/Destí
statistics: Estadístiques
@@ -309,6 +310,7 @@ ca:
layouts:
application:
about: Sobre TimeOverflow
+ bdtnear: Cerca Banc de Temps
edit_org: Modificar %{organization}
edit_profile: Modificar perfil
help: Ajuda
@@ -377,6 +379,7 @@ ca:
new: Nou banc
show:
contact_information: Informació de contacte
+ join_timebank: No dubtis en contactar amb el Banc de Temps per unir-te o per preguntar qualsevol dubte.
pages:
about:
app-mobile: Aplicació Mòbil
@@ -412,11 +415,8 @@ ca:
show:
info: Aquesta %{type} pertany a %{organization}.
reports:
- cat_with_users:
- title: Serveis ofertats
download: Descarregar
- user_list:
- title: Llistat d'usuaris
+ download_all: Descarregar tot
shared:
movements:
delete_reason: Esteu segur d'esborrar aquest comentari?
diff --git a/config/locales/en.yml b/config/locales/en.yml
index e7419738b..2a65f5c3e 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -293,6 +293,7 @@ en:
required_field: "* Required field"
save: Save
search: Search
+ search_location: Search by location
show: Show
source_destination: From/to
statistics: Statistics
@@ -309,6 +310,7 @@ en:
layouts:
application:
about: About TimeOverflow
+ bdtnear: Search Timebank
edit_org: Update %{organization}
edit_profile: Update my profile
help: Help
@@ -377,6 +379,7 @@ en:
new: New bank
show:
contact_information: Contact information
+ join_timebank: Don't hesitate to contact the time bank to join it or ask any questions.
pages:
about:
app-mobile: Mobile App
@@ -412,11 +415,8 @@ en:
show:
info: This %{type} belongs to %{organization}.
reports:
- cat_with_users:
- title: Offered Services
download: Download
- user_list:
- title: User List
+ download_all: Download all
shared:
movements:
delete_reason: Are you sure to delete this comment?
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 617a1a733..91d7203b4 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -293,6 +293,7 @@ es:
required_field: "* Campo obligatorio"
save: Guardar
search: Buscar
+ search_location: Buscar por localidad
show: Mostrar
source_destination: Origen/Destino
statistics: Estadísticas
@@ -309,6 +310,7 @@ es:
layouts:
application:
about: Sobre TimeOverflow
+ bdtnear: Busca Banco de Tiempo
edit_org: Modificar %{organization}
edit_profile: Modificar mi perfil
help: Ayuda
@@ -377,6 +379,7 @@ es:
new: Nuevo banco
show:
contact_information: Información de contacto
+ join_timebank: No dudes en contactar con el Banco de Tiempo para unirte o para resolver dudas.
pages:
about:
app-mobile: App Móvil
@@ -412,11 +415,8 @@ es:
show:
info: Esta %{type} pertenece a %{organization}.
reports:
- cat_with_users:
- title: Servicios ofrecidos
download: Descargar
- user_list:
- title: Listado usuarios
+ download_all: Descargar todo
shared:
movements:
delete_reason: "¿Está seguro de borrar este comentario?"
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 9b8eea255..aff3fbb19 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -293,6 +293,7 @@ eu:
required_field: Derrigorrez bete beharrekoa
save: Gorde
search: Bilatu
+ search_location:
show: Erakutsi
source_destination: Jatorria/ helmuga
statistics: Estatistika
@@ -309,6 +310,7 @@ eu:
layouts:
application:
about: TimeOverflowri buruz
+ bdtnear:
edit_org: " %{organization} aldaketak egin"
edit_profile: Nire profila aldatu
help: Laguntza
@@ -377,6 +379,7 @@ eu:
new: Banku berria
show:
contact_information: kontaktuaren informazioa
+ join_timebank:
pages:
about:
app-mobile: Mugikorrerako Appa
@@ -412,11 +415,8 @@ eu:
show:
info: "%{type} hau %{organization}(e)ri dagokio."
reports:
- cat_with_users:
- title: Eskaintzen diren zerbitzuak
download: Jaitsi
- user_list:
- title: Erabiltzaile zerrenda
+ download_all:
shared:
movements:
delete_reason: Zihur zaude azalpen hau ezabatu nahi duzula?
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 5316ba0a6..e24ed1004 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -293,6 +293,7 @@ gl:
required_field: "* Campo obrigatorio"
save: Gardar
search: Busca
+ search_location:
show: Amosar
source_destination: Dende/ata
statistics: Estatísticas
@@ -309,6 +310,7 @@ gl:
layouts:
application:
about: Sobre TimeOverflow
+ bdtnear:
edit_org: Actualización %{organization}
edit_profile: Actualiza o meu perfil
help: Axuda
@@ -377,6 +379,7 @@ gl:
new: Novo banco
show:
contact_information: Información de contacto
+ join_timebank:
pages:
about:
app-mobile: Aplicación móbil
@@ -412,11 +415,8 @@ gl:
show:
info: Este %{type} pertence a %{organization}.
reports:
- cat_with_users:
- title: Servizos ofrecidos
download: Descarga
- user_list:
- title: Lista de persoas usuarias
+ download_all:
shared:
movements:
delete_reason: Estás seguro/a de borrar este comentario?
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 2cd7b0755..50d54dfa6 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -293,6 +293,7 @@ pt-BR:
required_field: "* Campo obrigatório"
save: Guardar
search: Pesquisar
+ search_location:
show: Mostrar
source_destination: Origem/Destino
statistics: Estatísticas
@@ -309,6 +310,7 @@ pt-BR:
layouts:
application:
about: Sobre TimeOverflow
+ bdtnear:
edit_org: Modificar %{organization}
edit_profile: Modificar meu perfil
help: Ajuda
@@ -377,6 +379,7 @@ pt-BR:
new: Novo banco
show:
contact_information: Informação de contato
+ join_timebank:
pages:
about:
app-mobile: Aplicativo móvel
@@ -412,11 +415,8 @@ pt-BR:
show:
info: Este %{type} pertence a %{organization}.
reports:
- cat_with_users:
- title: Serviços oferecidos
download: Baixar
- user_list:
- title: Lista de usuários
+ download_all:
shared:
movements:
delete_reason: Tem certeza de que quer apagar este comentário?
diff --git a/config/routes.rb b/config/routes.rb
index cc8fd4c7e..a88d0ee40 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -64,6 +64,7 @@
get "offer_list" => :post_list, type: "offer"
get "inquiry_list" => :post_list, type: "inquiry"
get "transfer_list"
+ get "download_all"
end
end
diff --git a/spec/controllers/organizations_controller_spec.rb b/spec/controllers/organizations_controller_spec.rb
index e0ae5a717..20d71361f 100644
--- a/spec/controllers/organizations_controller_spec.rb
+++ b/spec/controllers/organizations_controller_spec.rb
@@ -2,12 +2,64 @@
let!(:organization) { Fabricate(:organization) }
let(:member) { Fabricate(:member, organization: organization) }
let(:user) { member.user }
+ let!(:second_organization) { Fabricate(:organization) }
describe 'GET #index' do
- it 'populates and array of organizations' do
- get :index
+ context 'without parameters' do
+ it 'populates and array of organizations' do
+ get :index
- expect(assigns(:organizations)).to eq([organization])
+ expect(assigns(:organizations)).to eq([organization, second_organization])
+ end
+ end
+
+ context 'a search is made' do
+ before do
+ second_organization.name = "Banco del tiempo Doe"
+ second_organization.city = "Sevilla"
+ second_organization.address = "Calle gloria"
+ second_organization.neighborhood = "La paz"
+ second_organization.save!
+
+ organization.neighborhood = "La paz"
+ organization.save!
+ end
+
+ it 'populates an array of organizations searching by city' do
+ get :index, params: { q: 'Sevilla' }
+
+ expect(assigns(:organizations)).to eq([second_organization])
+ end
+
+ it 'populates an array of organizations searching by name' do
+ get :index, params: { q: 'Doe' }
+
+ expect(assigns(:organizations)).to eq([second_organization])
+ end
+
+ it 'populates an array of organizations searching by address' do
+ get :index, params: { q: 'gloria' }
+
+ expect(assigns(:organizations)).to eq([second_organization])
+ end
+
+ it 'populates an array of organizations searching by neighborhood' do
+ get :index, params: { q: 'Paz' }
+
+ expect(assigns(:organizations)).to eq([organization, second_organization])
+ end
+
+ it 'allows to search by partial word' do
+ get :index, params: { q: 'Sev' }
+
+ expect(assigns(:organizations)).to eq([second_organization])
+ end
+
+ it 'populates an array of organizations ignoring accents' do
+ get :index, params: { q: 'Sevillá' }
+
+ expect(assigns(:organizations)).to eq([second_organization])
+ end
end
end
diff --git a/spec/controllers/reports_controller_spec.rb b/spec/controllers/reports_controller_spec.rb
index fc6a1688d..369402369 100644
--- a/spec/controllers/reports_controller_spec.rb
+++ b/spec/controllers/reports_controller_spec.rb
@@ -89,5 +89,24 @@
expect(response.media_type).to eq("application/pdf")
end
end
+
+ describe 'GET #download_all' do
+ it 'downloads a zip' do
+ get :download_all
+
+ expect(response.media_type).to eq('application/zip')
+ expect(response.body).to include('Inquiries')
+ expect(response.body).to include('Offers')
+ expect(response.body).to include('Members')
+ expect(response.body).to include('Transfers')
+ end
+
+ it 'redirects to download_all_report_path (retry) if zip is not ready' do
+ allow(subject).to receive(:add_csv_to_zip).and_raise(Errno::ENOENT)
+ get :download_all
+
+ expect(response).to redirect_to(download_all_report_path)
+ end
+ end
end
end
diff --git a/spec/fabricators/member_fabricator.rb b/spec/fabricators/member_fabricator.rb
index 2ccb0e8e1..82e63d64b 100644
--- a/spec/fabricators/member_fabricator.rb
+++ b/spec/fabricators/member_fabricator.rb
@@ -1,8 +1,6 @@
Fabricator(:member) do
-
user { Fabricate(:user) }
organization { Fabricate(:organization) }
manager false
active true
-
end
diff --git a/spec/fabricators/post_fabricator.rb b/spec/fabricators/post_fabricator.rb
index 919bd56b4..c5871867c 100644
--- a/spec/fabricators/post_fabricator.rb
+++ b/spec/fabricators/post_fabricator.rb
@@ -1,15 +1,12 @@
Fabricator(:post) do
-
title { Faker::Lorem.sentence }
user { Fabricate(:user) }
description { Faker::Lorem.paragraph }
category { Fabricate(:category) }
active { true }
-
end
Fabricator(:inquiry) do
-
type "Inquiry"
title { Faker::Lorem.sentence }
@@ -21,7 +18,6 @@
end
Fabricator(:offer) do
-
type "Offer"
title { Faker::Lorem.sentence }
@@ -29,5 +25,4 @@
description { Faker::Lorem.paragraph }
category { Fabricate(:category) }
active { true }
-
end
diff --git a/spec/models/taggable_spec.rb b/spec/models/taggable_spec.rb
index 80f420051..542c1a3dd 100644
--- a/spec/models/taggable_spec.rb
+++ b/spec/models/taggable_spec.rb
@@ -1,6 +1,7 @@
RSpec.describe Taggable do
let(:organization) { Fabricate(:organization) }
-
+ let(:tags) { %w(foo bar baz) }
+ let(:more_tags) { %w(foo baz qux) }
let!(:offer) do
Fabricate(
:offer,
@@ -17,9 +18,6 @@
end
context "class methods and scopes" do
- let(:tags) { %w(foo bar baz) }
- let(:more_tags) { %w(foo baz qux) }
-
it "tagged_with" do
expect(Offer.tagged_with("bar")).to eq [offer]
end
@@ -33,18 +31,28 @@
expect(Offer.find_like_tag("Foo")).to eq ["foo"]
expect(Offer.find_like_tag("none")).to eq []
end
- end
- describe '.alphabetical_grouped_tags' do
- let(:tags) { %w(foo bar baz Boo) }
- let(:more_tags) { %w(foo baz qux) }
+ describe '.alphabetical_grouped_tags' do
+ let(:tags) { %w(foo bar baz Boo) }
+ let(:more_tags) { %w(foo baz qux) }
- it 'sorts them by alphabetical order case insensitive' do
- expect(Offer.alphabetical_grouped_tags).to eq({
- 'B' => [['bar', 1], ['baz', 2], ['Boo', 1]],
- 'F' => [['foo', 2]],
- 'Q' => [['qux', 1]]
- })
+ it 'sorts them by alphabetical order case insensitive' do
+ expect(Offer.alphabetical_grouped_tags).to eq({
+ 'B' => [['bar', 1], ['baz', 2], ['Boo', 1]],
+ 'F' => [['foo', 2]],
+ 'Q' => [['qux', 1]]
+ })
+ end
end
end
+
+ it "#tag_list= writter accepts string and array" do
+ offer = Offer.new
+
+ offer.tag_list = ["a", "b"]
+ expect(offer.tag_list).to eq "a, b"
+
+ offer.tag_list = "c, d"
+ expect(offer.tag_list).to eq "c, d"
+ end
end