Skip to content

Commit aeaa026

Browse files
author
Ben Tillman
committed
Minor gem changes and turned of js_notify because of anoying deprication warnings
1 parent c187f5f commit aeaa026

File tree

4 files changed

+27
-26
lines changed

4 files changed

+27
-26
lines changed

Gemfile.lock

+20-21
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ GIT
5050
GEM
5151
remote: http://rubygems.org/
5252
specs:
53-
ZenTest (4.4.1)
53+
ZenTest (4.4.2)
5454
aaronh-chronic (0.3.9)
5555
abstract (1.0.0)
5656
actionmailer (3.0.3)
@@ -82,7 +82,7 @@ GEM
8282
acts-as-taggable-on (2.0.6)
8383
acts_as_commentable (3.0.1)
8484
archive-tar-minitar (0.5.2)
85-
arel (2.0.6)
85+
arel (2.0.7)
8686
autotest-rails (4.1.0)
8787
ZenTest
8888
builder (2.1.2)
@@ -103,8 +103,8 @@ GEM
103103
rack-test (>= 0.5.4)
104104
selenium-webdriver (>= 0.0.27)
105105
xpath (~> 0.1.2)
106-
celerity (0.8.5)
107-
childprocess (0.1.4)
106+
celerity (0.8.7)
107+
childprocess (0.1.6)
108108
ffi (~> 0.6.3)
109109
columnize (0.3.2)
110110
cucumber (0.10.0)
@@ -115,40 +115,39 @@ GEM
115115
term-ansicolor (~> 1.0.5)
116116
cucumber-rails (0.3.2)
117117
cucumber (>= 0.8.0)
118-
culerity (0.2.12)
118+
culerity (0.2.14)
119119
daemons (1.1.0)
120120
database_cleaner (0.6.0)
121121
diff-lcs (1.1.2)
122122
erubis (2.6.6)
123123
abstract (>= 1.0.0)
124124
eventmachine (0.12.10)
125-
factory_girl (1.3.2)
126-
ffaker (1.0.0)
125+
factory_girl (1.3.3)
126+
ffaker (1.2.0)
127127
ffi (0.6.3)
128128
rake (>= 0.8.7)
129-
gherkin (2.3.2)
129+
gherkin (2.3.3)
130130
json (~> 1.4.6)
131-
term-ansicolor (~> 1.0.5)
132-
haml (3.0.24)
131+
haml (3.0.25)
133132
headless (0.1.0)
134133
highline (1.6.1)
135134
hoe (2.8.0)
136135
rake (>= 0.8.7)
137136
hoptoad_notifier (2.4.2)
138137
activesupport
139138
builder
140-
httpclient (2.1.5.2)
139+
httpclient (2.1.6.1)
141140
i18n (0.5.0)
142141
json (1.4.6)
143142
json_pure (1.4.6)
144143
linecache19 (0.5.11)
145144
ruby_core_source (>= 0.1.4)
146-
mail (2.2.12)
145+
mail (2.2.14)
147146
activesupport (>= 2.3.6)
148147
i18n (>= 0.4.0)
149148
mime-types (~> 1.16)
150149
treetop (~> 1.4.8)
151-
meta_search (0.9.10)
150+
meta_search (1.0.1)
152151
actionpack (~> 3.0.2)
153152
activerecord (~> 3.0.2)
154153
activesupport (~> 3.0.2)
@@ -158,7 +157,7 @@ GEM
158157
net-ssh (>= 1.99.1)
159158
net-sftp (2.0.5)
160159
net-ssh (>= 2.0.9)
161-
net-ssh (2.0.23)
160+
net-ssh (2.0.24)
162161
net-ssh-gateway (1.0.1)
163162
net-ssh (>= 1.99.1)
164163
newrelic_rpm (2.13.4)
@@ -168,7 +167,7 @@ GEM
168167
rack (1.2.1)
169168
rack-mount (0.6.13)
170169
rack (>= 1.0.0)
171-
rack-test (0.5.6)
170+
rack-test (0.5.7)
172171
rack (>= 1.0)
173172
rails (3.0.3)
174173
actionmailer (= 3.0.3)
@@ -208,9 +207,9 @@ GEM
208207
ruby_core_source (0.1.4)
209208
archive-tar-minitar (>= 0.5.2)
210209
rubyzip (0.9.4)
211-
rvm (1.1.4)
212-
selenium-webdriver (0.1.1)
213-
childprocess (= 0.1.4)
210+
rvm (1.2.2)
211+
selenium-webdriver (0.1.2)
212+
childprocess (~> 0.1.5)
214213
ffi (~> 0.6.3)
215214
json_pure
216215
rubyzip
@@ -226,16 +225,16 @@ GEM
226225
thor (0.14.6)
227226
treetop (1.4.9)
228227
polyglot (>= 0.3.1)
229-
tzinfo (0.3.23)
230-
webrat (0.7.2)
228+
tzinfo (0.3.24)
229+
webrat (0.7.3)
231230
nokogiri (>= 1.2.0)
232231
rack (>= 1.0)
233232
rack-test (>= 0.5.3)
234233
whenever (0.6.2)
235234
aaronh-chronic (>= 0.3.9)
236235
activesupport (>= 2.3.4)
237236
will_paginate (3.0.pre2)
238-
xpath (0.1.2)
237+
xpath (0.1.3)
239238
nokogiri (~> 1.3)
240239

241240
PLATFORMS

config/initializers/hoptoad.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
HoptoadNotifier.configure do |config|
22
config.api_key = 'a95a20784fd5bce6e8aefba981fd7a99'
3-
config.js_notifier = true
3+
#~ config.js_notifier = true
44
config.environment_name = (ENV['HOSTNAME'] =~ /preview/ ? 'preview' : 'live')
55
end

spec/controllers/tasks_controller_spec.rb

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ def update_sidebar
88
end
99

1010
def produce_tasks(user, view)
11+
Time.zone = 'UTC'
1112
settings = (view != "completed" ? Setting.task_bucket : Setting.task_completed)
1213

1314
settings.inject({}) do | hash, due |
@@ -79,6 +80,7 @@ def produce_tasks(user, view)
7980

8081
(assigns[:tasks].keys.map(&:to_sym) - @tasks.keys).should == []
8182
(assigns[:tasks].values.flatten - @tasks.values.flatten).should == []
83+
#~ require 'ruby-debug';debugger
8284
response.body.should == @tasks.to_xml
8385
end
8486
end

spec/spec_helper.rb

+4-4
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
config.before(:each, :type => :view) do
4848
I18n.locale = 'en-US'
4949
end
50-
50+
5151
config.after(:each, :type => :view) do
5252
# detect html-quoted entities in all rendered responses
5353
rendered.should_not match(/&[A-Za-z]{1,6};/) if rendered
@@ -150,23 +150,23 @@ def self.controller_name
150150
end
151151

152152
if RUBY_VERSION.to_f >= 1.9
153-
RSpec::Rails::ViewExampleGroup::InstanceMethods.module_eval do
153+
RSpec::Rails::ViewExampleGroup::InstanceMethods.module_eval do
154154
def render_with_mock_response(*args)
155155
render_without_mock_response *args
156156
@response = mock(:body => rendered)
157157
end
158158
alias_method_chain :render, :mock_response
159159
end
160160
else
161-
RSpec::Rails::ViewExampleGroup::InstanceMethods.module_eval do
161+
RSpec::Rails::ViewExampleGroup::InstanceMethods.module_eval do
162162
# Ruby 1.8.x doesnt support alias_method_chain with blocks,
163163
# so we are just overwriting the whole method verbatim.
164164
def render(options={}, local_assigns={}, &block)
165165
options = {:template => _default_file_to_render} if Hash === options and options.empty?
166166
super(options, local_assigns, &block)
167167
@response = mock(:body => rendered)
168168
end
169-
end
169+
end
170170
end
171171

172172
ActionView::Base.class_eval do

0 commit comments

Comments
 (0)