Merge pull request hotsh#537 from clnclarinet/yaks

Yaks

Gemfile

@@ -52,6 +52,7 @@ group :development, :test do
   gem "simplecov", "~> 0.4.0", :require => false
   gem "launchy"
   gem "minitest", "~> 2.12.1"
+  gem "quiet_assets"
 end
 
 group :test do

Gemfile.lock

@@ -206,6 +206,8 @@ GEM
       mail (> 2.0)
     pygmentize (0.0.3)
     pyu-ruby-sasl (0.0.3.3)
+    quiet_assets (1.0.0)
+      rails (~> 3.1)
     rack (1.3.2)
     rack-cache (1.0.3)
       rack (>= 0.4)
@@ -333,6 +335,7 @@ DEPENDENCIES
   osub (~> 0.0.6)
   pony
   pygmentize
+  quiet_assets
   rails (= 3.1.0)
   rdiscount
   redfinger

app/controllers/searches_controller.rb

@@ -12,19 +12,4 @@ def show
       set_pagination_buttons(@updates)
     end
   end
-
-  # DERP, this duplication sucks, and this code kinda sucks
-  # anyway. Let's see if we can't remove it in the future.
-  def set_pagination
-    set_params_page
-    @updates = @updates.paginate(:page => params[:page], :per_page => params[:per_page], :order => :created_at.desc)
-    set_pagination_buttons(@updates)
-  end
-
-  # Render correct haml depending on request type
-  def render_index(updates)
-    @updates = updates
-    set_pagination
-    render :index, :layout => show_layout?
-  end
 end

config/routes.rb

@@ -13,8 +13,6 @@
   match "contact" => "static#contact"
   match "open_source" => "static#open_source"
   match "help" => "static#help"
-  # static for remote follows
-  match "/follow", :to => "static#follow"
 
   # External Auth
   match '/auth/:provider/callback', :to => 'auth#auth'

test/acceptance/update_test.rb

@@ -34,9 +34,6 @@
     log_in_as_some_user
 
     update_text = "Testing, testing"
-    params = {
-      :text => update_text
-    }
 
     VCR.use_cassette('publish_update') do
       visit "/"
@@ -47,43 +44,16 @@
     assert_match page.body, /#{update_text}/
   end
 
-  it "makes a short update" do
-    log_in_as_some_user
+  ["/updates", "/replies", "/"].each do |url|
+    it "stays on the #{url} page after making an update there" do
+      log_in_as_some_user
 
-    update_text = "Q"
-    params = {
-      :text => update_text
-    }
+      visit url
+      fill_in "text", :with => "Buy a test string. Your name in this string for only 1 Euro/character"
+      VCR.use_cassette('publish_to_hub') { click_button "Share" }
 
-    VCR.use_cassette('publish_short_update') do
-      visit "/"
-      fill_in 'update-textarea', :with => update_text
-      click_button :'update-button'
+      assert_match url, page.current_url, "Ended up on #{page.current_url}, expected to be on #{url}"
     end
-
-    refute_match page.body, /Your status is too short!/
-  end
-
-  it "stays on the same page after updating" do
-    log_in_as_some_user
-
-    visit "/updates"
-    fill_in "text", :with => "Teststring fuer die Ewigkeit ohne UTF-8 Charakter"
-    VCR.use_cassette('publish_to_hub') {click_button "Share"}
-
-    assert_match "/updates", page.current_url
-
-    visit "/replies"
-    fill_in "text", :with => "Bratwurst mit Pommes rot-weiss"
-    VCR.use_cassette('publish_to_hub') {click_button "Share"}
-
-    assert_match "/replies", page.current_url
-
-    visit "/"
-    fill_in "text", :with => "Buy a test string. Your name in this string for only 1 Euro/character"
-    VCR.use_cassette('publish_to_hub') {click_button "Share"}
-
-    assert_match "/", page.current_url
   end
 
   it "shows one update" do
@@ -273,7 +243,7 @@
 
     it "has a status of someone i'm following in my timeline" do
       u2 = Fabricate(:user)
-      update = Fabricate(:update, :author => @u.author)
+      update = Fabricate(:update, :author => u2.author)
       u2.feed.updates << update
       @u.follow! u2.feed