scottk/chatwoot
1
0
Fork 0
mirror of https://github.com/lingble/chatwoot.git synced 2025-11-02 03:57:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'hotfix/1.22.1' into develop

Browse Source 
# Conflicts:
#	db/schema.rb
This commit is contained in:
Sojan
2021-11-22 23:35:44 +05:30
parent 1a8b8f0900 791d90c6b7
commit 0033a35ab8
38 changed files with 211 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spec/controllers/api/v1/widget/configs_controller_spec.rb
View File

@@ -45,7 +45,7 @@ RSpec.describe '/api/v1/widget/config', type: :request do
expect(response).to have_http_status(:success)
response_data = JSON.parse(response.body)
expect(response_data.keys).to include(*response_keys)
expect(response_data['contact']['pubsub_token']).to eq(contact.pubsub_token)
expect(response_data['contact']['pubsub_token']).to eq(contact_inbox.pubsub_token)
end
end