From ba883e0af40ebdad8acb8d8890da7562cc8217a5 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Tue, 10 Oct 2017 13:09:25 +0800 Subject: [PATCH] Move specs to the right folder. --- .../chat_controller_spec.rb | 26 ++++++++++++++----- .../public_controller_spec.rb | 0 2 files changed, 19 insertions(+), 7 deletions(-) rename spec/{controllers => requests}/chat_controller_spec.rb (95%) rename spec/{controllers => requests}/public_controller_spec.rb (100%) diff --git a/spec/controllers/chat_controller_spec.rb b/spec/requests/chat_controller_spec.rb similarity index 95% rename from spec/controllers/chat_controller_spec.rb rename to spec/requests/chat_controller_spec.rb index 4322a3f..a1460ed 100644 --- a/spec/controllers/chat_controller_spec.rb +++ b/spec/requests/chat_controller_spec.rb @@ -49,10 +49,11 @@ describe 'Chat Controller', type: :request do expect(json['providers'].size).to eq(2) - expect(json['providers'].find { |h| h['name'] == 'dummy' }).to eq('name' => 'dummy', - 'id' => 'dummy', - 'channel_parameters' => [] - ) + expect(json['providers'].find { |h| h['name'] == 'dummy' }).to eq( + 'name' => 'dummy', + 'id' => 'dummy', + 'channel_parameters' => [] + ) end end end @@ -94,7 +95,12 @@ describe 'Chat Controller', type: :request do end it 'should return the right response' do - rule = DiscourseChat::Rule.create(channel: channel, filter: 'follow', category_id: category.id, tags: [tag.name]) + rule = DiscourseChat::Rule.create( + channel: channel, + filter: 'follow', + category_id: category.id, + tags: [tag.name] + ) get '/admin/plugins/chat/channels.json', params: { provider: 'dummy' } @@ -155,7 +161,6 @@ describe 'Chat Controller', type: :request do } expect(response).not_to be_success - end end end @@ -304,7 +309,14 @@ describe 'Chat Controller', type: :request do end describe 'deleting a rule' do - let(:rule) { DiscourseChat::Rule.create!(channel_id: channel.id, filter: 'follow', category_id: category.id, tags: [tag.name]) } + let(:rule) do + DiscourseChat::Rule.create!( + channel_id: channel.id, + filter: 'follow', + category_id: category.id, + tags: [tag.name] + ) + end include_examples 'admin constraints', 'delete', "/admin/plugins/chat/rules/1.json" diff --git a/spec/controllers/public_controller_spec.rb b/spec/requests/public_controller_spec.rb similarity index 100% rename from spec/controllers/public_controller_spec.rb rename to spec/requests/public_controller_spec.rb