diff --git a/tests/acceptance/site_tests.rb b/tests/acceptance/site_tests.rb index e19e888d..a38f5da7 100644 --- a/tests/acceptance/site_tests.rb +++ b/tests/acceptance/site_tests.rb @@ -30,7 +30,7 @@ describe 'site page' do visit "/browse?tag=#{tag}" - page.find('.website-Gallery .title a')['href'].must_match /#{blocked_site.host}/ + page.find('.website-Gallery .title a')['href'].must_match /\/surf\/#{blocked_site.username}/ visit "/site/#{blocked_site.username}" diff --git a/views/home.erb b/views/home.erb index 55318524..865fb209 100644 --- a/views/home.erb +++ b/views/home.erb @@ -3,7 +3,7 @@

Your Feed

- <% if !@events.empty? %> + <% if !@events.empty? || params[:activity] == 'mine' %> class="selected"<% end %>>All Activity    class="selected"<% end %>> @@ -25,6 +25,12 @@