Merge pull request #859 from consul/clickable-geozone

makes geozone clickable in proposal show

app/assets/stylesheets/layout.scss

@@ -605,34 +605,28 @@ footer {
 // 04. Tags
 // - - - - - - - - - - - - - - - - - - - - - - - - -
 
-.tags, .tag-cloud {
+.tags a , .tag-cloud a, .categories a, .geozone a {
+  background: #ececec;
+  border-radius: rem-calc(6);
+  color: $text;
+  display: inline-block;
+  font-size: $small-font-size;
+  margin-bottom: $line-height/3;
+  padding: $line-height/4 $line-height/3;
+  text-decoration: none;
 
-  a {
-    background: #ececec;
-    border-radius: rem-calc(6);
-    color: $text;
-    display: inline-block;
-    font-size: $small-font-size;
-    margin-bottom: $line-height/3;
-    padding: $line-height/4 $line-height/3;
-    text-decoration: none;
-
-    &:hover {
-      background: #e0e0e0;
-    }
+  &:hover {
+    background: #e0e0e0;
   }
 }
 
-.categories {
+.categories a, .geozone a {
+  background: $highlight;
+  color: $link;
 
-  a {
+  &:hover {
     background: $highlight;
-    border-radius: rem-calc(6);
-    display: inline-block;
-    font-size: $small-font-size;
-    margin-bottom: $line-height/3;
-    padding: $line-height/4 $line-height/3;
-    text-decoration: none;
+    color: $link-hover;
   }
 }
 

app/assets/stylesheets/participation.scss

@@ -521,7 +521,6 @@
 
   .tags {
     display: block;
-    margin: rem-calc(24) 0;
 
     a {
       margin-right: rem-calc(6);

app/views/shared/_geozone.html.erb

@@ -1,3 +1,3 @@
-<span id="geozone">
-  <%= geozone_name(geozonable) %>
+<span id="geozone" class="geozone">
+  <%= link_to geozone_name(geozonable), proposals_path(search: geozone_name(geozonable)) %>
 </span>

spec/features/debates_spec.rb

@@ -889,11 +889,12 @@ feature 'Debates' do
     context "By geozone" do
 
       background do
-        geozone1 = Geozone.create(name: "California")
-        geozone2 = Geozone.create(name: "New York")
+        @california = Geozone.create(name: "California")
+        @new_york   = Geozone.create(name: "New York")
 
-        @debate1 = create(:debate, geozone: geozone1)
-        @debate2 = create(:debate, geozone: geozone2)
+        @debate1 = create(:debate, geozone: @california)
+        @debate2 = create(:debate, geozone: @california)
+        @debate3 = create(:debate, geozone: @new_york)
       end
 
       pending "From map" do
@@ -906,8 +907,10 @@ feature 'Debates' do
         end
 
         within("#debates") do
-          expect(page).to have_css('.debate', count: 1)
+          expect(page).to have_css('.debate', count: 2)
           expect(page).to have_content(@debate1.title)
+          expect(page).to have_content(@debate2.title)
+          expect(page).to_not have_content(@debate3.title)
         end
       end
 
@@ -918,13 +921,30 @@ feature 'Debates' do
         within("#geozones") do
           click_link "California"
         end
-
         within("#debates") do
-          expect(page).to have_css('.debate', count: 1)
+          expect(page).to have_css('.debate', count: 2)
           expect(page).to have_content(@debate1.title)
+          expect(page).to have_content(@debate2.title)
+          expect(page).to_not have_content(@debate3.title)
         end
       end
+
+      pending "From debate" do
+        visit debate_path(@debate1)
+
+        within("#geozone") do
+          click_link "California"
+        end
+
+        within("#debates") do
+          expect(page).to have_css('.debate', count: 2)
+          expect(page).to have_content(@debate1.title)
+          expect(page).to have_content(@debate2.title)
+          expect(page).to_not have_content(@debate3.title)
+        end
+      end
+
     end
   end
 
-end
+end

spec/features/proposals_spec.rb

@@ -1047,11 +1047,12 @@ feature 'Proposals' do
     context "By geozone" do
 
       background do
-        geozone1 = Geozone.create(name: "California")
-        geozone2 = Geozone.create(name: "New York")
+        @california = Geozone.create(name: "California")
+        @new_york   = Geozone.create(name: "New York")
 
-        @proposal1 = create(:proposal, geozone: geozone1)
-        @proposal2 = create(:proposal, geozone: geozone2)
+        @proposal1 = create(:proposal, geozone: @california)
+        @proposal2 = create(:proposal, geozone: @california)
+        @proposal3 = create(:proposal, geozone: @new_york)
       end
 
       scenario "From map" do
@@ -1064,8 +1065,10 @@ feature 'Proposals' do
         end
 
         within("#proposals") do
-          expect(page).to have_css('.proposal', count: 1)
+          expect(page).to have_css('.proposal', count: 2)
           expect(page).to have_content(@proposal1.title)
+          expect(page).to have_content(@proposal2.title)
+          expect(page).to_not have_content(@proposal3.title)
         end
       end
 
@@ -1076,12 +1079,29 @@ feature 'Proposals' do
         within("#geozones") do
           click_link "California"
         end
-
         within("#proposals") do
-          expect(page).to have_css('.proposal', count: 1)
+          expect(page).to have_css('.proposal', count: 2)
           expect(page).to have_content(@proposal1.title)
+          expect(page).to have_content(@proposal2.title)
+          expect(page).to_not have_content(@proposal3.title)
         end
       end
+
+      scenario "From proposal" do
+        visit proposal_path(@proposal1)
+
+        within("#geozone") do
+          click_link "California"
+        end
+
+        within("#proposals") do
+          expect(page).to have_css('.proposal', count: 2)
+          expect(page).to have_content(@proposal1.title)
+          expect(page).to have_content(@proposal2.title)
+          expect(page).to_not have_content(@proposal3.title)
+        end
+      end
+
     end
   end