github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 22:43:33 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: lint the files

Browse Source
This commit is contained in:
Sam Saffron
2019-04-29 17:40:53 +10:00
parent 45285f1477
commit ac3dab93f5
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/controllers/admin/web_hooks_controller.rb
View File

@ -92,10 +92,12 @@ class Admin::WebHooksController < Admin::AdminController
now = Time.zone.now now = Time.zone.now
response = conn.post(headers: MultiJson.load(web_hook_event.headers), body: web_hook_event.payload) response = conn.post(headers: MultiJson.load(web_hook_event.headers), body: web_hook_event.payload)
web_hook_event.update!(status: response.status, web_hook_event.update!(
response_headers: MultiJson.dump(response.headers), status: response.status,
response_body: response.body, response_headers: MultiJson.dump(response.headers),
duration: ((Time.zone.now - now) * 1000).to_i) response_body: response.body,
duration: ((Time.zone.now - now) * 1000).to_i
)
render_serialized(web_hook_event, AdminWebHookEventSerializer, root: 'web_hook_event') render_serialized(web_hook_event, AdminWebHookEventSerializer, root: 'web_hook_event')
else else
render json: failed_json render json: failed_json

16
spec/services/user_anonymizer_spec.rb
View File

@ -75,13 +75,15 @@ describe UserAnonymizer do
user.update(name: "Bibi", date_of_birth: 19.years.ago, title: "Super Star") user.update(name: "Bibi", date_of_birth: 19.years.ago, title: "Super Star")
profile = user.reload.user_profile profile = user.reload.user_profile
profile.update(location: "Moose Jaw", profile.update(
website: "www.bim.com", location: "Moose Jaw",
bio_raw: "I'm Bibi from Moosejaw. I sing and dance.", website: "www.bim.com",
bio_cooked: "I'm Bibi from Moosejaw. I sing and dance.", bio_raw: "I'm Bibi from Moosejaw. I sing and dance.",
profile_background: "http://example.com/bg.jpg", bio_cooked: "I'm Bibi from Moosejaw. I sing and dance.",
bio_cooked_version: 2, profile_background: "http://example.com/bg.jpg",
card_background: "http://example.com/cb.jpg") bio_cooked_version: 2,
card_background: "http://example.com/cb.jpg"
)
prev_username = user.username prev_username = user.username