Download as
Browse Code »

Commit 396c338863d4ac192aa7b9ee155a1a074285d6df

Authored by Cyril Mougel
1 parent b0587473
Exists in master and in 1 other branch production

Update some gems and fix spec with this update

Showing 5 changed files with 107 additions and 84 deletions   Show diff stats
Gemfile
  Diff comments   View file @396c338
1   -source 'http://rubygems.org'
  1 +source 'https://rubygems.org'
2 2  
3   -gem 'rails', '~> 3.2.13'
4   -gem 'mongoid', '~> 3.1.4'
  3 +RAILS_VERSION = '~> 3.2.14'
5 4  
6   -gem 'mongoid_rails_migrations', '~> 1.0.1'
7   -gem 'devise'
  5 +gem 'actionmailer', RAILS_VERSION
  6 +gem 'actionpack', RAILS_VERSION
  7 +gem 'railties', RAILS_VERSION
  8 +
  9 +gem 'mongoid'
  10 +
  11 +gem 'mongoid_rails_migrations'
  12 +gem 'devise', '~> 2.2.1'
8 13 gem 'haml'
9 14 gem 'htmlentities'
10 15 gem 'rack-ssl', :require => 'rack/ssl' # force SSL
... ... @@ -37,7 +42,7 @@ gem 'pivotal-tracker'
37 42 # Fogbugz
38 43 gem 'ruby-fogbugz', :require => 'fogbugz'
39 44 # Github Issues
40   -gem 'octokit'
  45 +gem 'octokit', '~> 1.18'
41 46 # Gitlab
42 47 gem 'gitlab', :git => 'https://github.com/NARKOZ/gitlab.git'
43 48  
... ...
Gemfile.lock
  Diff comments   View file @396c338
... ... @@ -6,18 +6,18 @@ GIT
6 6 httparty
7 7  
8 8 GEM
9   - remote: http://rubygems.org/
  9 + remote: https://rubygems.org/
10 10 specs:
11   - actionmailer (3.2.13)
12   - actionpack (= 3.2.13)
13   - mail (~> 2.5.3)
  11 + actionmailer (3.2.14)
  12 + actionpack (= 3.2.14)
  13 + mail (~> 2.5.4)
14 14 actionmailer_inline_css (1.5.3)
15 15 actionmailer (>= 3.0.0)
16 16 nokogiri (>= 1.4.4)
17 17 premailer (>= 1.7.1)
18   - actionpack (3.2.13)
19   - activemodel (= 3.2.13)
20   - activesupport (= 3.2.13)
  18 + actionpack (3.2.14)
  19 + activemodel (= 3.2.14)
  20 + activesupport (= 3.2.14)
21 21 builder (~> 3.0.0)
22 22 erubis (~> 2.7.0)
23 23 journey (~> 1.0.4)
... ... @@ -25,35 +25,35 @@ GEM
25 25 rack-cache (~> 1.2)
26 26 rack-test (~> 0.6.1)
27 27 sprockets (~> 2.2.1)
28   - activemodel (3.2.13)
29   - activesupport (= 3.2.13)
  28 + activemodel (3.2.14)
  29 + activesupport (= 3.2.14)
30 30 builder (~> 3.0.0)
31   - activerecord (3.2.13)
32   - activemodel (= 3.2.13)
33   - activesupport (= 3.2.13)
  31 + activerecord (3.2.14)
  32 + activemodel (= 3.2.14)
  33 + activesupport (= 3.2.14)
34 34 arel (~> 3.0.2)
35 35 tzinfo (~> 0.3.29)
36   - activeresource (3.2.13)
37   - activemodel (= 3.2.13)
38   - activesupport (= 3.2.13)
39   - activesupport (3.2.13)
40   - i18n (= 0.6.1)
  36 + activeresource (3.2.14)
  37 + activemodel (= 3.2.14)
  38 + activesupport (= 3.2.14)
  39 + activesupport (3.2.14)
  40 + i18n (~> 0.6, >= 0.6.4)
41 41 multi_json (~> 1.0)
42 42 addressable (2.3.5)
43   - airbrake (3.1.13)
  43 + airbrake (3.1.14)
44 44 builder
45 45 json
46 46 arel (3.0.2)
47   - bcrypt-ruby (3.1.1)
48   - better_errors (0.9.0)
  47 + bcrypt-ruby (3.1.2)
  48 + better_errors (1.0.1)
49 49 coderay (>= 1.0.0)
50 50 erubis (>= 2.6.6)
51 51 binding_of_caller (0.7.2)
52 52 debug_inspector (>= 0.0.1)
53   - bitbucket_rest_api (0.1.2)
  53 + bitbucket_rest_api (0.1.4)
54 54 faraday (~> 0.8.1)
55   - faraday_middleware (~> 0.8.1)
56   - hashie (~> 1.2.0)
  55 + faraday_middleware (~> 0.9.0)
  56 + hashie (~> 2.0.5)
57 57 multi_json (~> 1.3)
58 58 nokogiri (~> 1.5.2)
59 59 simple_oauth
... ... @@ -77,44 +77,42 @@ GEM
77 77 childprocess (0.3.9)
78 78 ffi (~> 1.0, >= 1.0.11)
79 79 coderay (1.0.9)
80   - colorize (0.5.8)
81 80 columnize (0.3.6)
82   - coveralls (0.6.7)
83   - colorize
  81 + coveralls (0.7.0)
84 82 multi_json (~> 1.3)
85 83 rest-client
86 84 simplecov (>= 0.7)
  85 + term-ansicolor
87 86 thor
88 87 crack (0.4.1)
89 88 safe_yaml (~> 0.9.0)
90   - css_parser (1.3.4)
  89 + css_parser (1.3.5)
91 90 addressable
92 91 database_cleaner (0.9.1)
93 92 debug_inspector (0.0.2)
94   - debugger (1.6.1)
  93 + debugger (1.6.2)
95 94 columnize (>= 0.3.1)
96 95 debugger-linecache (~> 1.2.0)
97 96 debugger-ruby_core_source (~> 1.2.3)
98 97 debugger-linecache (1.2.0)
99 98 debugger-ruby_core_source (1.2.3)
100   - decent_exposure (2.2.1)
  99 + decent_exposure (2.3.0)
101 100 devise (2.2.7)
102 101 bcrypt-ruby (~> 3.0)
103 102 orm_adapter (~> 0.1)
104 103 railties (~> 3.1)
105 104 warden (~> 1.2.1)
106 105 diff-lcs (1.2.4)
107   - dotenv (0.8.0)
  106 + dotenv (0.9.0)
108 107 email_spec (1.5.0)
109 108 launchy (~> 2.1)
110 109 mail (~> 2.2)
111 110 erubis (2.7.0)
112   - execjs (1.4.0)
113   - multi_json (~> 1.0)
  111 + execjs (2.0.1)
114 112 fabrication (1.3.2)
115 113 faraday (0.8.8)
116 114 multipart-post (~> 1.2.0)
117   - faraday_middleware (0.8.8)
  115 + faraday_middleware (0.9.0)
118 116 faraday (>= 0.7.4, < 0.9)
119 117 ffi (1.9.0)
120 118 flowdock (0.3.1)
... ... @@ -127,10 +125,10 @@ GEM
127 125 tilt
128 126 happymapper (0.4.0)
129 127 libxml-ruby (~> 2.0)
130   - hashie (1.2.0)
  128 + hashie (2.0.5)
131 129 highline (1.6.19)
132 130 hike (1.2.3)
133   - hipchat (0.11.0)
  131 + hipchat (0.12.0)
134 132 httparty
135 133 hoi (0.0.6)
136 134 httparty (> 0.6.0)
... ... @@ -143,7 +141,7 @@ GEM
143 141 multi_json (~> 1.0)
144 142 multi_xml (>= 0.5.2)
145 143 httpauth (0.2.0)
146   - i18n (0.6.1)
  144 + i18n (0.6.5)
147 145 jira-ruby (0.1.2)
148 146 activesupport
149 147 oauth
... ... @@ -158,7 +156,7 @@ GEM
158 156 kaminari (0.14.1)
159 157 actionpack (>= 3.0.0)
160 158 activesupport (>= 3.0.0)
161   - kgio (2.8.0)
  159 + kgio (2.8.1)
162 160 launchy (2.3.0)
163 161 addressable (~> 2.3)
164 162 libv8 (3.16.14.3)
... ... @@ -176,12 +174,12 @@ GEM
176 174 rack-contrib
177 175 railties
178 176 method_source (0.8.2)
179   - mime-types (1.24)
180   - mongoid (3.1.4)
  177 + mime-types (1.25)
  178 + mongoid (3.1.5)
181 179 activemodel (~> 3.2)
182 180 moped (~> 1.4)
183 181 origin (~> 1.0)
184   - tzinfo (~> 0.3.22)
  182 + tzinfo (~> 0.3.29)
185 183 mongoid-rspec (1.9.0)
186 184 mongoid (>= 3.0.1)
187 185 rake
... ... @@ -192,16 +190,17 @@ GEM
192 190 rails (>= 3.2.0)
193 191 railties (>= 3.2.0)
194 192 moped (1.5.1)
195   - multi_json (1.7.9)
  193 + multi_json (1.8.0)
196 194 multi_xml (0.5.5)
197 195 multipart-post (1.2.0)
198 196 net-scp (1.1.2)
199 197 net-ssh (>= 2.6.5)
200 198 net-sftp (2.1.2)
201 199 net-ssh (>= 2.6.5)
202   - net-ssh (2.6.8)
  200 + net-ssh (2.7.0)
203 201 net-ssh-gateway (1.2.0)
204 202 net-ssh (>= 2.6.5)
  203 + netrc (0.7.7)
205 204 nokogiri (1.5.10)
206 205 nokogiri-happymapper (0.5.7)
207 206 nokogiri (~> 1.5)
... ... @@ -212,12 +211,13 @@ GEM
212 211 jwt (~> 0.1.4)
213 212 multi_json (~> 1.0)
214 213 rack (~> 1.2)
215   - octokit (1.18.0)
  214 + octokit (1.25.0)
216 215 addressable (~> 2.2)
217 216 faraday (~> 0.8)
218   - faraday_middleware (~> 0.8)
219   - hashie (~> 1.2)
  217 + faraday_middleware (~> 0.9)
  218 + hashie (~> 2.0)
220 219 multi_json (~> 1.3)
  220 + netrc (~> 0.7.7)
221 221 omniauth (1.1.4)
222 222 hashie (>= 1.2, < 3)
223 223 rack
... ... @@ -231,7 +231,8 @@ GEM
231 231 orm_adapter (0.4.0)
232 232 oruen_redmine_client (0.0.1)
233 233 activeresource (>= 2.3.0)
234   - pivotal-tracker (0.5.10)
  234 + pivotal-tracker (0.5.12)
  235 + builder
235 236 builder
236 237 crack
237 238 happymapper (>= 0.3.2)
... ... @@ -239,6 +240,7 @@ GEM
239 240 nokogiri (>= 1.5.5)
240 241 nokogiri-happymapper (>= 0.5.4)
241 242 rest-client (~> 1.6.0)
  243 + rest-client (~> 1.6.0)
242 244 pjax_rails (0.3.4)
243 245 jquery-rails
244 246 polyglot (0.3.3)
... ... @@ -262,27 +264,27 @@ GEM
262 264 rack (>= 0.9.1)
263 265 rack-ssl (1.3.3)
264 266 rack
265   - rack-ssl-enforcer (0.2.5)
  267 + rack-ssl-enforcer (0.2.6)
266 268 rack-test (0.6.2)
267 269 rack (>= 1.0)
268   - rails (3.2.13)
269   - actionmailer (= 3.2.13)
270   - actionpack (= 3.2.13)
271   - activerecord (= 3.2.13)
272   - activeresource (= 3.2.13)
273   - activesupport (= 3.2.13)
  270 + rails (3.2.14)
  271 + actionmailer (= 3.2.14)
  272 + actionpack (= 3.2.14)
  273 + activerecord (= 3.2.14)
  274 + activeresource (= 3.2.14)
  275 + activesupport (= 3.2.14)
274 276 bundler (~> 1.0)
275   - railties (= 3.2.13)
276   - rails_autolink (1.1.0)
  277 + railties (= 3.2.14)
  278 + rails_autolink (1.1.4)
277 279 rails (> 3.1)
278   - railties (3.2.13)
279   - actionpack (= 3.2.13)
280   - activesupport (= 3.2.13)
  280 + railties (3.2.14)
  281 + actionpack (= 3.2.14)
  282 + activesupport (= 3.2.14)
281 283 rack-ssl (~> 1.3.2)
282 284 rake (>= 0.8.7)
283 285 rdoc (~> 3.4)
284 286 thor (>= 0.14.6, < 2.0)
285   - raindrops (0.11.0)
  287 + raindrops (0.12.0)
286 288 rake (10.1.0)
287 289 rbx-require-relative (0.0.9)
288 290 rdoc (3.12.2)
... ... @@ -296,7 +298,7 @@ GEM
296 298 rspec-expectations (~> 2.14.0)
297 299 rspec-mocks (~> 2.14.0)
298 300 rspec-core (2.14.5)
299   - rspec-expectations (2.14.2)
  301 + rspec-expectations (2.14.3)
300 302 diff-lcs (>= 1.1.3, < 2.0)
301 303 rspec-mocks (2.14.3)
302 304 rspec-rails (2.14.0)
... ... @@ -317,11 +319,11 @@ GEM
317 319 rushover (0.3.0)
318 320 json
319 321 rest-client
320   - safe_yaml (0.9.5)
321   - selenium-webdriver (2.35.0)
  322 + safe_yaml (0.9.7)
  323 + selenium-webdriver (2.35.1)
322 324 childprocess (>= 0.2.5)
323 325 multi_json (~> 1.0)
324   - rubyzip
  326 + rubyzip (< 1.0.0)
325 327 websocket (~> 1.0.4)
326 328 simple_oauth (0.2.0)
327 329 simplecov (0.7.1)
... ... @@ -338,27 +340,30 @@ GEM
338 340 actionpack (~> 3.0)
339 341 activemodel (~> 3.0)
340 342 railties (~> 3.0)
341   - taskmapper (0.8.0)
  343 + taskmapper (0.8.1)
342 344 activeresource (~> 3.0)
343 345 activesupport (~> 3.0)
344   - hashie (~> 1.2)
  346 + hashie (~> 2.0)
345 347 taskmapper-unfuddle (0.7.0)
346 348 addressable (~> 2.2)
347 349 taskmapper (~> 0.8)
  350 + term-ansicolor (1.2.2)
  351 + tins (~> 0.8)
348 352 therubyracer (0.12.0)
349 353 libv8 (~> 3.16.14.0)
350 354 ref
351 355 thor (0.18.1)
352 356 tilt (1.4.1)
353 357 timecop (0.6.1)
  358 + tins (0.10.0)
354 359 treetop (1.4.15)
355 360 polyglot
356 361 polyglot (>= 0.3.1)
357   - turbo-sprockets-rails3 (0.3.9)
  362 + turbo-sprockets-rails3 (0.3.10)
358 363 railties (> 3.2.8, < 4.0.0)
359 364 sprockets (>= 2.0.0)
360 365 tzinfo (0.3.37)
361   - uglifier (2.1.2)
  366 + uglifier (2.2.1)
362 367 execjs (>= 0.3.0)
363 368 multi_json (~> 1.0, >= 1.0.2)
364 369 underscore-rails (1.5.1)
... ... @@ -366,7 +371,7 @@ GEM
366 371 kgio (~> 2.6)
367 372 rack
368 373 raindrops (~> 0.7)
369   - useragent (0.6.0)
  374 + useragent (0.7.0)
370 375 warden (1.2.3)
371 376 rack (>= 1.0)
372 377 webmock (1.13.0)
... ... @@ -382,7 +387,9 @@ PLATFORMS
382 387 ruby
383 388  
384 389 DEPENDENCIES
  390 + actionmailer (~> 3.2.14)
385 391 actionmailer_inline_css
  392 + actionpack (~> 3.2.14)
386 393 airbrake
387 394 better_errors
388 395 binding_of_caller
... ... @@ -394,7 +401,7 @@ DEPENDENCIES
394 401 database_cleaner (~> 0.9.0)
395 402 debugger
396 403 decent_exposure
397   - devise
  404 + devise (~> 2.2.1)
398 405 email_spec
399 406 execjs
400 407 fabrication (~> 1.3.0)
... ... @@ -413,10 +420,10 @@ DEPENDENCIES
413 420 launchy
414 421 lighthouse-api
415 422 meta_request
416   - mongoid (~> 3.1.4)
  423 + mongoid
417 424 mongoid-rspec
418   - mongoid_rails_migrations (~> 1.0.1)
419   - octokit
  425 + mongoid_rails_migrations
  426 + octokit (~> 1.18)
420 427 omniauth-github
421 428 oruen_redmine_client
422 429 pivotal-tracker
... ... @@ -426,8 +433,8 @@ DEPENDENCIES
426 433 quiet_assets
427 434 rack-ssl
428 435 rack-ssl-enforcer
429   - rails (~> 3.2.13)
430 436 rails_autolink
  437 + railties (~> 3.2.14)
431 438 ri_cal
432 439 rspec-rails (~> 2.6)
433 440 ruby-debug
... ...
app/models/issue_trackers/github_issues_tracker.rb
  Diff comments   View file @396c338
... ... @@ -35,7 +35,11 @@ if defined? Octokit
35 35 end
36 36  
37 37 begin
38   - issue = client.create_issue(project_id, issue_title(problem), body_template.result(binding).unpack('C*').pack('U*'))
  38 + issue = client.create_issue(
  39 + project_id,
  40 + issue_title(problem),
  41 + body_template.result(binding).unpack('C*').pack('U*')
  42 + )
39 43 problem.update_attributes(
40 44 :issue_link => issue.html_url,
41 45 :issue_type => Label
... ...
spec/models/error_report_spec.rb
  Diff comments   View file @396c338
... ... @@ -2,6 +2,7 @@ require &#39;spec_helper&#39;
2 2 require 'airbrake/version'
3 3 require 'airbrake/backtrace'
4 4 require 'airbrake/notice'
  5 +require 'airbrake/utils/params_cleaner'
5 6  
6 7 # MonkeyPatch to instanciate a Airbrake::Notice without configure
7 8 # Airbrake
... ... @@ -141,9 +142,9 @@ describe ErrorReport do
141 142  
142 143 it 'find the correct err for the notice' do
143 144 err = Fabricate(:err, :problem => Fabricate(:problem, :resolved => true))
144   -
  145 +
145 146 ErrorReport.any_instance.stub(:fingerprint).and_return(err.fingerprint)
146   -
  147 +
147 148 expect {
148 149 error_report.generate_notice!
149 150 }.to change {
... ...
spec/models/issue_trackers/github_issues_tracker_spec.rb
  Diff comments   View file @396c338
... ... @@ -25,8 +25,14 @@ describe IssueTrackers::GithubIssuesTracker do
25 25 }
26 26 EOF
27 27  
28   - stub_request(:post, "https://#{tracker.username}:#{tracker.password}@api.github.com/repos/#{repo}/issues").
29   - to_return(:status => 201, :headers => {'Location' => @issue_link}, :body => body )
  28 + stub_request(:post,
  29 + "https://#{tracker.username}:#{tracker.password}@api.github.com/repos/#{repo}/issues").
  30 + to_return(:status => 201,
  31 + :headers => {
  32 + 'Location' => @issue_link,
  33 + 'Content-Type' => 'application/json',
  34 + },
  35 + :body => body )
30 36  
31 37 problem.app.issue_tracker.create_issue(problem)
32 38 problem.reload
... ...