This commit is contained in:
David Taylor 2017-08-04 00:54:11 +01:00
parent 12f3b96e02
commit 9dc5445b7b
2 changed files with 6 additions and 6 deletions

View File

@ -49,7 +49,7 @@ module DiscourseChat::Provider::SlackProvider
def process_post_request(channel, tokens, slack_channel_id, channel_name)
if SiteSetting.chat_integration_slack_access_token.empty?
return I18n.t("chat_integration.provider.slack.api_required")
return { text: I18n.t("chat_integration.provider.slack.transcript.api_required") }
end
requested_messages = 10
@ -66,7 +66,7 @@ module DiscourseChat::Provider::SlackProvider
channel_name: channel_name,
requested_messages: requested_messages)
return { text: I18n.t("chat_integration.provider.slack.transcript_error") } unless transcript
return { text: I18n.t("chat_integration.provider.slack.transcript.error") } unless transcript
return transcript.build_slack_ui
@ -92,7 +92,7 @@ module DiscourseChat::Provider::SlackProvider
first_message_ts: first_message,
last_message_ts: last_message)
return { text: I18n.t("chat_integration.provider.slack.transcript_error") } unless transcript
return { text: I18n.t("chat_integration.provider.slack.transcript.error") } unless transcript
message = transcript.build_slack_ui

View File

@ -127,7 +127,7 @@ describe 'Slack Command Controller', type: :request do
json = JSON.parse(response.body)
expect(json["text"]).to include(I18n.t("chat_integration.provider.slack.post_to_discourse"))
# expect(json["text"]).to include(I18n.t("chat_integration.provider.slack.post_to_discourse"))
end
it 'deals with failed API calls correctly' do
@ -141,7 +141,7 @@ describe 'Slack Command Controller', type: :request do
json = JSON.parse(response.body)
expect(json["text"]).to include(I18n.t("chat_integration.provider.slack.transcript_error"))
expect(json["text"]).to include(I18n.t("chat_integration.provider.slack.transcript.error"))
end
it 'errors correctly if there is no api key' do
@ -155,7 +155,7 @@ describe 'Slack Command Controller', type: :request do
json = JSON.parse(response.body)
expect(json["text"]).to include(I18n.t("chat_integration.provider.slack.api_required"))
expect(json["text"]).to include(I18n.t("chat_integration.provider.slack.transcript.api_required"))
end
end