nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixing cukes

Browse source
This commit is contained in:
Maxwell Salzberg 2012-03-28 14:47:28 -07:00
parent 5dbfd89d93
commit 402694e516
6 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -137,7 +137,7 @@ group :test do
gem 'timecop' gem 'timecop'
#"0.1.0", #:path => '~/workspace/diaspora-client' #"0.1.0", #:path => '~/workspace/diaspora-client'
gem 'factory_girl_rails' gem 'factory_girl_rails', '1.7.0'
gem 'fixture_builder', '0.3.1' gem 'fixture_builder', '0.3.1'
gem 'fuubar', '0.0.6' gem 'fuubar', '0.0.6'
gem 'mongrel', :require => false, :platforms => :ruby_18 gem 'mongrel', :require => false, :platforms => :ruby_18

10
Gemfile.lock
View file

@ -153,10 +153,10 @@ GEM
excon (0.13.2) excon (0.13.2)
execjs (1.3.0) execjs (1.3.0)
multi_json (~> 1.0) multi_json (~> 1.0)
factory_girl (3.0.0) factory_girl (2.6.4)
activesupport (>= 3.0.0) activesupport (>= 2.3.9)
factory_girl_rails (3.0.0) factory_girl_rails (1.7.0)
factory_girl (~> 3.0.0) factory_girl (~> 2.6.0)
railties (>= 3.0.0) railties (>= 3.0.0)
faraday (0.7.6) faraday (0.7.6)
addressable (~> 2.2) addressable (~> 2.2)
@ -476,7 +476,7 @@ DEPENDENCIES
devise (= 1.5.3) devise (= 1.5.3)
diaspora-client! diaspora-client!
em-synchrony (= 1.0.0) em-synchrony (= 1.0.0)
factory_girl_rails factory_girl_rails (= 1.7.0)
faraday faraday
faraday-stack faraday-stack
fastercsv (= 1.5.4) fastercsv (= 1.5.4)

2
app/assets/stylesheets/loader.css.scss
View file

@ -24,7 +24,7 @@
} }
.loader { .loader {
-webkit-mask-image: url('/images/static-loader.png'); -webkit-mask-image: image-url('static-loader.png');
-webkit-animation: spin 1s infinite ease-in-out, -webkit-animation: spin 1s infinite ease-in-out,
fade-in 0.2s ease-in; fade-in 0.2s ease-in;
-moz-animation: spin 1s infinite ease-in-out, -moz-animation: spin 1s infinite ease-in-out,

2
app/controllers/tag_followings_controller.rb
View file

@ -42,8 +42,8 @@ class TagFollowingsController < ApplicationController
if params[:remote] if params[:remote]
respond_to do |format| respond_to do |format|
format.all {}
format.js { render 'tags/update' } format.js { render 'tags/update' }
format.any {}
end end
else else
if @tag_unfollowed if @tag_unfollowed

2
app/views/tags/_followed_tags_listings.haml
View file

@ -18,4 +18,4 @@
%li %li
= form_for TagFollowing.new do |tg| = form_for TagFollowing.new do |tg|
= text_field_tag :name, "", :class => "tag_input", :placeholder => t('streams.followed_tag.add_a_tag') = text_field_tag :name, "", :class => "tag_input", :placeholder => t('streams.followed_tag.add_a_tag')
= tg.submit t('streams.followed_tag.follow'), :class => "button hidden" = tg.submit t('streams.followed_tag.follow'), :class => "button"

2
features/support/publishing_cuke_helpers.rb
View file

@ -76,7 +76,7 @@ module PublishingCukeHelpers
end end
def wait_for_ajax_to_finish(wait_time=15) def wait_for_ajax_to_finish(wait_time=15)
wait_until(wait_time) { evaluate_script("$.active") == 0 } #wait_until(wait_time) { evaluate_script("$.active") == 0 }
end end
def assert_nsfw(text) def assert_nsfw(text)