From b7b08b41732bce065e5b338a6f6134a461ffaa25 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Mon, 21 May 2018 13:25:56 +0800 Subject: [PATCH] Fix regression introduced in https://github.com/discourse/discourse/commit/2ceb1070743f2d0081def11cc06bc3a9d8e7dd0e. --- config/routes.rb | 2 +- spec/requests/admin/site_texts_controller_spec.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index 5636b1a3520..bc35b838fba 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -214,7 +214,7 @@ Discourse::Application.routes.draw do # They have periods in their URLs often: get 'site_texts' => 'site_texts#index' get 'site_texts/:id' => 'site_texts#show', constraints: { id: /[\w.\-\+]+/i } - put 'site_texts/:id.json' => 'site_texts#update', constraints: { id: /[\w.\-\+]+/i } + put 'site_texts/:id' => 'site_texts#update', constraints: { id: /[\w.\-\+]+[^.json]/i } delete 'site_texts/:id' => 'site_texts#revert', constraints: { id: /[\w.\-\+]+/i } get 'email_templates' => 'email_templates#index' diff --git a/spec/requests/admin/site_texts_controller_spec.rb b/spec/requests/admin/site_texts_controller_spec.rb index 7df5e849b53..f19c6015c8f 100644 --- a/spec/requests/admin/site_texts_controller_spec.rb +++ b/spec/requests/admin/site_texts_controller_spec.rb @@ -45,7 +45,7 @@ RSpec.describe Admin::SiteTextsController do end it "works as expectd with correct keys" do - put '/admin/customize/site_texts/title.json', params: { + put '/admin/customize/site_texts/login_required.welcome_message.json', params: { site_text: { value: 'foo' } } @@ -54,7 +54,7 @@ RSpec.describe Admin::SiteTextsController do json = ::JSON.parse(response.body) site_text = json['site_text'] - expect(site_text['id']).to eq('title') + expect(site_text['id']).to eq('login_required.welcome_message') expect(site_text['value']).to eq('foo') end