Skip to content

Commit

Permalink
Only load dummy providers in specs where they are required
Browse files Browse the repository at this point in the history
  • Loading branch information
davidtaylorhq committed Jul 31, 2017
1 parent 142687f commit 04c711e
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 17 deletions.
3 changes: 2 additions & 1 deletion spec/controllers/chat_controller_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
let(:channel) { DiscourseChat::Channel.create(provider:'dummy') }

include_context "dummy provider"
include_context "validated dummy provider"

before do
SiteSetting.chat_integration_enabled = true
Expand Down Expand Up @@ -48,7 +49,7 @@

expect(json['providers'].size).to eq(2)

expect(json['providers'][0]).to eq('name'=> 'dummy',
expect(json['providers'].find{|h| h['name']=='dummy'}).to eq('name'=> 'dummy',
'id'=> 'dummy',
'channel_parameters'=> []
)
Expand Down
23 changes: 7 additions & 16 deletions spec/dummy_provider.rb
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@

RSpec.shared_context "dummy provider" do
before(:each) do
if defined? ::DiscourseChat::Provider::DummyProvider
::DiscourseChat::Provider.send(:remove_const, :DummyProvider)
end

module ::DiscourseChat::Provider::DummyProvider
PROVIDER_NAME = "dummy".freeze
PROVIDER_ENABLED_SETTING = :chat_integration_enabled # Tie to main plugin enabled setting
Expand Down Expand Up @@ -32,18 +28,17 @@ def self.set_raise_exception(bool)
@@raise_exception = bool
end
end

end

after(:each) do
::DiscourseChat::Provider.send(:remove_const, :DummyProvider)
end

let(:provider){::DiscourseChat::Provider::DummyProvider}
end

RSpec.shared_context "validated dummy provider" do
before(:each) do
if defined? ::DiscourseChat::Provider::Dummy2Provider
::DiscourseChat::Provider.send(:remove_const, :Dummy2Provider)
end

module ::DiscourseChat::Provider::Dummy2Provider
PROVIDER_NAME = "dummy2".freeze
PROVIDER_ENABLED_SETTING = :chat_integration_enabled # Tie to main plugin enabled setting
Expand All @@ -64,11 +59,7 @@ def self.sent_messages

end

let(:provider){::DiscourseChat::Provider::DummyProvider}
after(:each) do
::DiscourseChat::Provider.send(:remove_const, :Dummy2Provider)
end
end

RSpec.configure do |rspec|
rspec.include_context "dummy provider"
rspec.include_context "validated dummy provider"

end

0 comments on commit 04c711e

Please sign in to comment.