Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge remote branch 'upstream/master'

  • Loading branch information...
commit 13f512f5d30227fba13e84029b4066b0d6b6d12a 2 parents 42b92e0 + b0e428b
David Morley authored
2  Gemfile
@@ -155,7 +155,7 @@ group :test do
155 155
   gem 'fixture_builder', '0.3.3'
156 156
   gem 'fuubar', '>= 1.0'
157 157
   gem 'rspec-instafail', '>= 0.1.7', :require => false
158  
-  gem 'selenium-webdriver', '2.22.1'
  158
+  gem 'selenium-webdriver', '~> 2.22.1'
159 159
 
160 160
   gem 'webmock', '~> 1.7', :require => false
161 161
 
12  Gemfile.lock
@@ -118,10 +118,10 @@ GEM
118 118
     coffee-script-source (1.3.3)
119 119
     columnize (0.3.6)
120 120
     crack (0.3.1)
121  
-    cucumber (1.2.0)
  121
+    cucumber (1.2.1)
122 122
       builder (>= 2.1.2)
123 123
       diff-lcs (>= 1.1.3)
124  
-      gherkin (~> 2.10.0)
  124
+      gherkin (~> 2.11.0)
125 125
       json (>= 1.4.6)
126 126
     cucumber-rails (1.3.0)
127 127
       capybara (>= 1.1.2)
@@ -178,7 +178,7 @@ GEM
178 178
       rspec (~> 2.0)
179 179
       rspec-instafail (~> 0.2.0)
180 180
       ruby-progressbar (~> 0.0.10)
181  
-    gherkin (2.10.0)
  181
+    gherkin (2.11.0)
182 182
       json (>= 1.4.6)
183 183
     gon (3.0.4)
184 184
       actionpack (>= 2.3.0)
@@ -403,13 +403,13 @@ GEM
403 403
     ruby-hmac (0.4.0)
404 404
     ruby-oembed (0.8.7)
405 405
     ruby-progressbar (0.0.10)
406  
-    rubyzip (0.9.8)
  406
+    rubyzip (0.9.9)
407 407
     sass (3.1.19)
408 408
     sass-rails (3.2.5)
409 409
       railties (~> 3.2.0)
410 410
       sass (>= 3.1.10)
411 411
       tilt (~> 1.3)
412  
-    selenium-webdriver (2.22.1)
  412
+    selenium-webdriver (2.22.2)
413 413
       childprocess (>= 0.2.5)
414 414
       ffi (~> 1.0)
415 415
       libwebsocket (~> 0.1.3)
@@ -543,7 +543,7 @@ DEPENDENCIES
543 543
   ruby-debug
544 544
   ruby-oembed (~> 0.8.7)
545 545
   sass-rails (= 3.2.5)
546  
-  selenium-webdriver (= 2.22.1)
  546
+  selenium-webdriver (~> 2.22.1)
547 547
   settingslogic!
548 548
   spork (~> 1.0rc2)
549 549
   thin (~> 1.3.1)
2  app/controllers/tags_controller.rb
@@ -35,7 +35,7 @@ def show
35 35
     @stream = Stream::Tag.new(current_user, params[:name], :max_time => max_time, :page => params[:page])
36 36
 
37 37
     respond_with do |format|
38  
-      format.json{ render :json => PostPresenter.collection_json(@stream.stream_posts, current_user) }
  38
+      format.json { render :json => @stream.stream_posts.map { |p| LastThreeCommentsDecorator.new(PostPresenter.new(p, current_user)) }}
39 39
     end
40 40
   end
41 41
 
9  app/uploaders/unprocessed_image.rb
@@ -17,6 +17,15 @@ def filename
17 17
     model.random_string + File.extname(@filename) if @filename
18 18
   end
19 19
 
  20
+  process :orient_image
  21
+
  22
+  def orient_image
  23
+    manipulate! do |img|
  24
+      img.auto_orient
  25
+      img
  26
+    end
  27
+  end
  28
+
20 29
   version :thumb_small
21 30
   version :thumb_medium
22 31
   version :thumb_large
23  features/tags_and_comments.feature
... ...
@@ -0,0 +1,23 @@
  1
+@javascript
  2
+Feature: Issue #3382 The comments under postings are missing when using the #tags -view
  3
+
  4
+  Background:
  5
+    Given a user named "Bob Jones" with email "bob@bob.bob"
  6
+    And I sign in as "bob@bob.bob"
  7
+    When I post "This is a post with a #tag"
  8
+    And I wait for 1 second
  9
+    And I am on the homepage
  10
+
  11
+  Scenario:
  12
+    When I search for "#tag"
  13
+    Then I should be on the tag page for "tag"
  14
+    And I should see "This is a post with a #tag"
  15
+
  16
+  Scenario:
  17
+    When I comment "this is a comment on my post" on "This is a post with a #tag"
  18
+    And I wait for the ajax to finish
  19
+    And I search for "#tag"
  20
+    Then I should be on the tag page for "tag"
  21
+    And I should see "this is a comment on my post"
  22
+
  23
+

0 notes on commit 13f512f

Please sign in to comment.
Something went wrong with that request. Please try again.