From 8d54e5141311415f55c898ee12e5e053324976a2 Mon Sep 17 00:00:00 2001
From: nachogomez <nac.madrid@gmail.com>
Date: Thu, 21 Jan 2016 09:55:15 +0100
Subject: [PATCH] change test in debates and proposals for district Select
 geozone.name

---
 app/controllers/proposals_controller.rb |  2 +-
 spec/features/debates_spec.rb           | 15 +++++++++++++--
 spec/features/proposals_spec.rb         | 16 ++++++++++++++--
 3 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/app/controllers/proposals_controller.rb b/app/controllers/proposals_controller.rb
index 4a5e17af3..224e57a9d 100644
--- a/app/controllers/proposals_controller.rb
+++ b/app/controllers/proposals_controller.rb
@@ -34,7 +34,7 @@ class ProposalsController < ApplicationController
   private
 
     def proposal_params
-      params.require(:proposal).permit(:title, :question, :summary, :description, :external_url, :video_url, :responsible_name, :tag_list, :terms_of_service, :captcha, :captcha_key)
+      params.require(:proposal).permit(:title, :question, :summary, :description, :external_url, :video_url, :responsible_name, :tag_list, :terms_of_service, :captcha, :captcha_key, :geozone_id)
     end
 
     def resource_model
diff --git a/spec/features/debates_spec.rb b/spec/features/debates_spec.rb
index 6ef03d06e..71d2d3113 100644
--- a/spec/features/debates_spec.rb
+++ b/spec/features/debates_spec.rb
@@ -198,9 +198,13 @@ feature 'Debates' do
       login_as(author)
     end
 
-    scenario 'using featured tags', :js do
+    scenario 'using featured tags and geozone district', :js do
       ['Medio Ambiente', 'Ciencia'].each do |tag_name|
-        create(:tag, :featured, name: tag_name)
+        create(:tag, :featured, name: tag_name, kind: "category")
+      end
+
+      ['Distrito A', 'Distrito B'].each do |geozone_name|
+        create(:geozone, name: geozone_name)
       end
 
       visit new_debate_path
@@ -214,12 +218,19 @@ feature 'Debates' do
         find('.js-add-tag-link', text: tag_name).click
       end
 
+      ['Distrito A', 'Distrito B'].each do |geozone_name|
+        find('.js-add-tag-link', text: geozone_name).click
+      end
+
       click_button 'Start a debate'
 
       expect(page).to have_content 'Debate created successfully.'
       ['Medio Ambiente', 'Ciencia'].each do |tag_name|
         expect(page).to have_content tag_name
       end
+      ['Distrito A', 'Distrito B'].each do |tag_name|
+        expect(page).to have_content tag_name
+      end
     end
 
     scenario 'using dangerous strings' do
diff --git a/spec/features/proposals_spec.rb b/spec/features/proposals_spec.rb
index e6938a432..5f2d18e30 100644
--- a/spec/features/proposals_spec.rb
+++ b/spec/features/proposals_spec.rb
@@ -270,18 +270,22 @@ feature 'Proposals' do
     expect(page.html).to_not include "<script>alert('hey')</script>"
   end
 
-  context 'Tagging proposals' do
+  context 'Tagging proposals ' do
     let(:author) { create(:user) }
 
     background do
       login_as(author)
     end
 
-    scenario 'using featured tags', :js do
+    scenario 'using featured tags and geozone district', :js do
       ['Medio Ambiente', 'Ciencia'].each do |tag_name|
         create(:tag, :featured, name: tag_name)
       end
 
+      ['Distrito A', 'Distrito B'].each do |geozone_name|
+        create(:geozone, name: geozone_name)
+      end
+      
       visit new_proposal_path
 
       fill_in 'proposal_title', with: 'A test with enough characters'
@@ -297,12 +301,20 @@ feature 'Proposals' do
         find('.js-add-tag-link', text: tag_name).click
       end
 
+      ['Distrito A', 'Distrito B'].each do |geozone_name|
+        find('.js-add-tag-link', text: geozone_name).click
+      end
+
       click_button 'Create proposal'
 
       expect(page).to have_content 'Proposal created successfully.'
       ['Medio Ambiente', 'Ciencia'].each do |tag_name|
         expect(page).to have_content tag_name
       end
+      
+      ['Distrito A', 'Distrito B'].each do |tag_name|
+        expect(page).to have_content tag_name
+      end
     end
 
     scenario 'using dangerous strings' do