diff --git a/Gemfile.lock b/Gemfile.lock index 7ed7be7..3ede952 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -32,23 +32,23 @@ GEM thread_safe (~> 0.1) tzinfo (~> 1.1) addressable (2.3.8) - airbrake (3.1.14) + airbrake (4.3.0) builder - json + multi_json arel (5.0.1.20140414130214) - bcrypt (3.1.9) - bcrypt (3.1.9-java) - better_errors (1.0.1) + bcrypt (3.1.10) + bcrypt (3.1.10-java) + better_errors (2.1.1) coderay (>= 1.0.0) erubis (>= 2.6.6) + rack (>= 0.9.0) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) - bson (2.3.0) - bson (2.3.0-java) + bson (3.1.1) + bson (3.1.1-java) builder (3.2.2) - byebug (2.7.0) - columnize (~> 0.3) - debugger-linecache (~> 1.2) + byebug (4.0.5) + columnize (= 0.9.0) callsite (0.0.11) campy (1.0.0) capistrano (3.4.0) @@ -58,7 +58,7 @@ GEM capistrano-bundler (1.1.4) capistrano (~> 3.1) sshkit (~> 1.2) - capistrano-rails (1.1.2) + capistrano-rails (1.1.3) capistrano (~> 3.1) capistrano-bundler (~> 1.1) capistrano-rbenv (2.0.3) @@ -71,30 +71,29 @@ GEM rack-test (>= 0.5.4) xpath (~> 2.0) cliver (0.3.2) - coderay (1.0.9) + coderay (1.1.0) coffee-rails (4.1.0) coffee-script (>= 2.2.0) railties (>= 4.0.0, < 5.0) - coffee-script (2.3.0) + coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.8.0) - colorize (0.7.5) + coffee-script-source (1.9.1.1) + colorize (0.7.7) columnize (0.9.0) - connection_pool (2.1.1) - coveralls (0.7.0) - multi_json (~> 1.3) - rest-client - simplecov (>= 0.7) - term-ansicolor - thor - css_parser (1.3.5) + connection_pool (2.2.0) + coveralls (0.8.2) + json (~> 1.8) + rest-client (>= 1.6.8, < 2) + simplecov (~> 0.10.0) + term-ansicolor (~> 1.3) + thor (~> 0.19.1) + css_parser (1.3.6) addressable - database_cleaner (1.2.0) + database_cleaner (1.4.1) debug_inspector (0.0.2) - debugger-linecache (1.2.0) decent_exposure (2.3.2) - devise (3.4.1) + devise (3.5.1) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 3.2.6, < 5) @@ -102,10 +101,14 @@ GEM thread_safe (~> 0.1) warden (~> 1.2.3) diff-lcs (1.2.5) - dotenv (2.0.0) - dotenv-rails (2.0.0) - dotenv (= 2.0.0) - draper (1.4.0) + docile (1.1.5) + domain_name (0.5.24) + unf (>= 0.0.5, < 1.0.0) + dotenv (2.0.2) + dotenv-rails (2.0.2) + dotenv (= 2.0.2) + railties (~> 4.0) + draper (2.1.0) actionpack (>= 3.0) activemodel (>= 3.0) activesupport (>= 3.0) @@ -118,17 +121,17 @@ GEM octokit errbit_plugin (0.5.0) erubis (2.7.0) - execjs (2.0.2) - fabrication (2.9.0) + execjs (2.5.2) + fabrication (2.13.2) faraday (0.9.1) multipart-post (>= 1.2, < 3) - ffi (1.9.6-java) - flowdock (0.3.1) + ffi (1.9.8-java) + flowdock (0.6.0) httparty (~> 0.7) multi_json - haml (4.0.3) + haml (4.0.6) tilt - hashie (2.0.5) + hashie (3.4.2) hipchat (1.5.1) httparty mimemagic @@ -139,22 +142,22 @@ GEM activesupport builder htmlentities (4.3.3) + http-cookie (1.0.2) + domain_name (~> 0.5) httparty (0.13.5) json (~> 1.8) multi_xml (>= 0.5.2) - httpauth (0.2.0) i18n (0.7.0) jquery-rails (2.1.4) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) json (1.8.3) json (1.8.3-java) - jwt (0.1.8) - multi_json (>= 1.5) - kaminari (0.14.1) + jwt (1.5.1) + kaminari (0.16.3) actionpack (>= 3.0.0) activesupport (>= 3.0.0) - kgio (2.9.2) + kgio (2.9.3) launchy (2.4.3) addressable (~> 2.3) launchy (2.4.3-java) @@ -163,12 +166,12 @@ GEM libv8 (3.16.14.7) mail (2.6.3) mime-types (>= 1.16, < 3) - meta_request (0.2.8) - callsite - rack-contrib - railties + meta_request (0.3.4) + callsite (~> 0.0, >= 0.0.11) + rack-contrib (~> 1.1) + railties (>= 3.0.0, < 5.0.0) method_source (0.8.2) - mime-types (1.25.1) + mime-types (2.6.1) mimemagic (0.3.0) mini_portile (0.6.2) minitest (5.7.0) @@ -177,7 +180,7 @@ GEM moped (~> 2.0.0) origin (~> 2.1) tzinfo (>= 0.3.37) - mongoid-rspec (2.0.0) + mongoid-rspec (2.2.0) mongoid (~> 4.0.0) rake rspec (~> 3.1) @@ -186,8 +189,8 @@ GEM bundler (>= 1.0.0) rails (>= 3.2.0) railties (>= 3.2.0) - moped (2.0.4) - bson (~> 2.2) + moped (2.0.6) + bson (~> 3.0) connection_pool (~> 2.0) optionable (~> 0.2.0) multi_json (1.11.1) @@ -196,62 +199,64 @@ GEM net-scp (1.2.1) net-ssh (>= 2.6.5) net-ssh (2.9.2) - nokogiri (1.6.5) + netrc (0.10.3) + nokogiri (1.6.6.2) mini_portile (~> 0.6.0) - nokogiri (1.6.5-java) - oauth2 (0.8.1) - faraday (~> 0.8) - httpauth (~> 0.1) - jwt (~> 0.1.4) - multi_json (~> 1.0) + nokogiri (1.6.6.2-java) + oauth2 (1.0.0) + faraday (>= 0.8, < 0.10) + jwt (~> 1.0) + multi_json (~> 1.3) + multi_xml (~> 0.5) rack (~> 1.2) octokit (3.8.0) sawyer (~> 0.6.0, >= 0.5.3) - omniauth (1.1.4) - hashie (>= 1.2, < 3) - rack - omniauth-github (1.1.1) + omniauth (1.2.2) + hashie (>= 1.2, < 4) + rack (~> 1.0) + omniauth-github (1.1.2) omniauth (~> 1.0) omniauth-oauth2 (~> 1.1) - omniauth-oauth2 (1.1.1) - oauth2 (~> 0.8.0) - omniauth (~> 1.0) + omniauth-oauth2 (1.3.1) + oauth2 (~> 1.0) + omniauth (~> 1.2) optionable (0.2.0) origin (2.1.1) orm_adapter (0.5.0) - pjax_rails (0.3.4) + pjax_rails (0.4.0) jquery-rails - poltergeist (1.5.1) + railties (>= 3.2, < 5.0) + poltergeist (1.6.0) capybara (~> 2.1) cliver (~> 0.3.1) multi_json (~> 1.0) websocket-driver (>= 0.2.0) - power_assert (0.2.2) - premailer (1.7.3) - css_parser (>= 1.1.9) + power_assert (0.2.3) + premailer (1.8.4) + css_parser (>= 1.3.6) htmlentities (>= 4.0.0) - pry (0.9.12.2) - coderay (~> 1.0.5) - method_source (~> 0.8) + pry (0.10.1) + coderay (~> 1.1.0) + method_source (~> 0.8.1) slop (~> 3.4) - pry (0.9.12.2-java) - coderay (~> 1.0.5) - method_source (~> 0.8) + pry (0.10.1-java) + coderay (~> 1.1.0) + method_source (~> 0.8.1) slop (~> 3.4) spoon (~> 0.0) - pry-byebug (1.3.2) - byebug (~> 2.7) - pry (~> 0.9.12) - pry-rails (0.3.2) + pry-byebug (3.1.0) + byebug (~> 4.0) + pry (~> 0.10) + pry-rails (0.3.4) pry (>= 0.9.10) - quiet_assets (1.0.2) + quiet_assets (1.1.0) railties (>= 3.1, < 5.0) - rack (1.5.4) - rack-contrib (1.1.0) + rack (1.5.5) + rack-contrib (1.2.0) rack (>= 0.9.1) - rack-ssl (1.4.0) + rack-ssl (1.4.1) rack - rack-ssl-enforcer (0.2.6) + rack-ssl-enforcer (0.2.8) rack-test (0.6.3) rack (>= 1.0) rails (4.1.11) @@ -278,47 +283,47 @@ GEM thor (>= 0.18.1, < 2.0) raindrops (0.13.0) rake (10.4.2) - rdoc (4.1.2) - json (~> 1.4) ref (1.0.5) request_store (1.1.0) responders (1.1.2) railties (>= 3.2, < 4.2) - rest-client (1.6.8) - mime-types (~> 1.16) - rdoc (>= 2.4.2) + rest-client (1.8.0) + http-cookie (>= 1.0.2, < 2.0) + mime-types (>= 1.16, < 3.0) + netrc (~> 0.7) ri_cal (0.8.8) - rspec (3.1.0) - rspec-core (~> 3.1.0) - rspec-expectations (~> 3.1.0) - rspec-mocks (~> 3.1.0) + rspec (3.3.0) + rspec-core (~> 3.3.0) + rspec-expectations (~> 3.3.0) + rspec-mocks (~> 3.3.0) rspec-activemodel-mocks (1.0.1) activemodel (>= 3.0) activesupport (>= 3.0) rspec-mocks (>= 2.99, < 4.0) - rspec-core (3.1.7) - rspec-support (~> 3.1.0) - rspec-expectations (3.1.2) + rspec-core (3.3.1) + rspec-support (~> 3.3.0) + rspec-expectations (3.3.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.1.0) - rspec-its (1.1.0) + rspec-support (~> 3.3.0) + rspec-its (1.2.0) rspec-core (>= 3.0.0) rspec-expectations (>= 3.0.0) - rspec-mocks (3.1.3) - rspec-support (~> 3.1.0) - rspec-rails (3.1.0) - actionpack (>= 3.0) - activesupport (>= 3.0) - railties (>= 3.0) - rspec-core (~> 3.1.0) - rspec-expectations (~> 3.1.0) - rspec-mocks (~> 3.1.0) - rspec-support (~> 3.1.0) - rspec-support (3.1.2) + rspec-mocks (3.3.1) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.3.0) + rspec-rails (3.3.2) + actionpack (>= 3.0, < 4.3) + activesupport (>= 3.0, < 4.3) + railties (>= 3.0, < 4.3) + rspec-core (~> 3.3.0) + rspec-expectations (~> 3.3.0) + rspec-mocks (~> 3.3.0) + rspec-support (~> 3.3.0) + rspec-support (3.3.0) rushover (0.3.0) json rest-client - sass (3.4.14) + sass (3.4.15) sass-rails (5.0.3) railties (>= 4.0.0, < 5.0) sass (~> 3.1) @@ -328,16 +333,17 @@ GEM sawyer (0.6.0) addressable (~> 2.3.5) faraday (~> 0.8, < 0.10) - simplecov (0.7.1) - multi_json (~> 1.0) - simplecov-html (~> 0.7.1) - simplecov-html (0.7.1) - slop (3.4.6) + simplecov (0.10.0) + docile (~> 1.1.0) + json (~> 1.8) + simplecov-html (~> 0.10.0) + simplecov-html (0.10.0) + slop (3.6.0) spoon (0.0.4) ffi sprockets (3.2.0) rack (~> 1.0) - sprockets-rails (2.3.1) + sprockets-rails (2.3.2) actionpack (>= 3.0) activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) @@ -345,9 +351,9 @@ GEM colorize (>= 0.7.0) net-scp (>= 1.1.2) net-ssh (>= 2.8.0) - term-ansicolor (1.2.2) - tins (~> 0.8) - test-unit (3.0.8) + term-ansicolor (1.3.2) + tins (~> 1.0) + test-unit (3.1.2) power_assert therubyracer (0.12.2) libv8 (~> 3.16.14.0) @@ -356,30 +362,34 @@ GEM thread_safe (0.3.5) thread_safe (0.3.5-java) tilt (1.4.1) - timecop (0.6.3) - tins (0.12.0) + timecop (0.7.4) + tins (1.5.4) tzinfo (1.2.2) thread_safe (~> 0.1) - uglifier (2.2.1) + uglifier (2.7.1) execjs (>= 0.3.0) json (>= 1.8.0) - underscore-rails (1.5.2) - unicorn (4.8.3) + underscore-rails (1.8.3) + unf (0.1.4) + unf_ext + unf (0.1.4-java) + unf_ext (0.0.7.1) + unicorn (4.9.0) kgio (~> 2.6) rack raindrops (~> 0.7) - useragent (0.9.0) + useragent (0.14.0) warden (1.2.3) rack (>= 1.0) - websocket-driver (0.5.1) + websocket-driver (0.5.4) websocket-extensions (>= 0.1.0) - websocket-driver (0.5.1-java) + websocket-driver (0.5.4-java) websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.1) - xmpp4r (0.5.5) + websocket-extensions (0.1.2) + xmpp4r (0.5.6) xpath (2.0.0) nokogiri (~> 1.3) - yajl-ruby (1.1.0) + yajl-ruby (1.2.1) PLATFORMS java @@ -452,6 +462,3 @@ DEPENDENCIES useragent xmpp4r yajl-ruby - -BUNDLED WITH - 1.10.3 diff --git a/spec/fabricators/notification_service_fabricator.rb b/spec/fabricators/notification_service_fabricator.rb index b608eec..82fb6fb 100644 --- a/spec/fabricators/notification_service_fabricator.rb +++ b/spec/fabricators/notification_service_fabricator.rb @@ -6,20 +6,20 @@ Fabricator :notification_service do notify_at_notices { sequence { |a| [0]} } end -Fabricator :gtalk_notification_service, :from => :notification_service, :class_name => "NotificationService::GtalkService" do +Fabricator :gtalk_notification_service, :from => :notification_service, :class_name => "NotificationServices::GtalkService" do user_id { sequence :word } service_url { sequence :word } service { sequence :word } end -Fabricator :slack_notification_service, :from => :notification_service, :class_name => "NotificationService::SlackService" do +Fabricator :slack_notification_service, :from => :notification_service, :class_name => "NotificationServices::SlackService" do service_url { sequence :word } end -Fabricator :hipchat_notification_service, :from => :notification_service, :class_name => "NotificationService::HipchatService" do +Fabricator :hipchat_notification_service, :from => :notification_service, :class_name => "NotificationServices::HipchatService" do service { 'v2' } end %w(campfire flowdock hoiio hubot pushover webhook).each do |t| - Fabricator "#{t}_notification_service".to_sym, :from => :notification_service, :class_name => "NotificationService::#{t.camelcase}Service" + Fabricator "#{t}_notification_service".to_sym, :from => :notification_service, :class_name => "NotificationServices::#{t.camelcase}Service" end diff --git a/spec/models/notification_service/campfire_service_spec.rb b/spec/models/notification_service/campfire_service_spec.rb index e0ef6fa..f883c68 100644 --- a/spec/models/notification_service/campfire_service_spec.rb +++ b/spec/models/notification_service/campfire_service_spec.rb @@ -1,4 +1,4 @@ -describe NotificationService::CampfireService, type: 'model' do +describe NotificationServices::CampfireService, type: 'model' do it "it should send a notification to campfire" do # setup notice = Fabricate :notice diff --git a/spec/models/notification_service/gtalk_service_spec.rb b/spec/models/notification_service/gtalk_service_spec.rb index e8ce238..6319033 100644 --- a/spec/models/notification_service/gtalk_service_spec.rb +++ b/spec/models/notification_service/gtalk_service_spec.rb @@ -1,4 +1,4 @@ -describe NotificationService::GtalkService, type: 'model' do +describe NotificationServices::GtalkService, type: 'model' do it "it should send a notification to gtalk" do # setup notice = Fabricate :notice diff --git a/spec/models/notification_service/hoiio_service_spec.rb b/spec/models/notification_service/hoiio_service_spec.rb index 869bad8..870a90f 100644 --- a/spec/models/notification_service/hoiio_service_spec.rb +++ b/spec/models/notification_service/hoiio_service_spec.rb @@ -1,4 +1,4 @@ -describe NotificationService::HoiioService, type: 'model' do +describe NotificationServices::HoiioService, type: 'model' do it "it should send a notification to hoiio" do # setup notice = Fabricate :notice diff --git a/spec/models/notification_service/hubot_service_spec.rb b/spec/models/notification_service/hubot_service_spec.rb index 3ee5c6f..feee7c0 100644 --- a/spec/models/notification_service/hubot_service_spec.rb +++ b/spec/models/notification_service/hubot_service_spec.rb @@ -1,4 +1,4 @@ -describe NotificationService::HubotService, type: 'model' do +describe NotificationServices::HubotService, type: 'model' do it "it should send a notification to Hubot" do # setup notice = Fabricate :notice diff --git a/spec/models/notification_service/notification_service_spec.rb b/spec/models/notification_service/notification_service_spec.rb index c9fb3bf..9007ee9 100644 --- a/spec/models/notification_service/notification_service_spec.rb +++ b/spec/models/notification_service/notification_service_spec.rb @@ -1,4 +1,4 @@ -describe NotificationService, type: 'model' do +describe NotificationServices, type: 'model' do let(:notice) { Fabricate :notice } let(:notification_service) { Fabricate :notification_service, :app => notice.app } diff --git a/spec/models/notification_service/pushover_service_spec.rb b/spec/models/notification_service/pushover_service_spec.rb index 32be10b..f6014b7 100644 --- a/spec/models/notification_service/pushover_service_spec.rb +++ b/spec/models/notification_service/pushover_service_spec.rb @@ -1,4 +1,4 @@ -describe NotificationService::PushoverService, type: 'model' do +describe NotificationServices::PushoverService, type: 'model' do it "it should send a notification to Pushover" do # setup notice = Fabricate :notice diff --git a/spec/models/notification_service/slack_service_spec.rb b/spec/models/notification_service/slack_service_spec.rb index 4b47332..1692257 100644 --- a/spec/models/notification_service/slack_service_spec.rb +++ b/spec/models/notification_service/slack_service_spec.rb @@ -1,4 +1,4 @@ -describe NotificationService::SlackService, type: 'model' do +describe NotificationServices::SlackService, type: 'model' do it "it should send a notification to Slack with hook url" do # setup notice = Fabricate :notice diff --git a/spec/models/notification_service/webhook_service_spec.rb b/spec/models/notification_service/webhook_service_spec.rb index 0550b30..43c269b 100644 --- a/spec/models/notification_service/webhook_service_spec.rb +++ b/spec/models/notification_service/webhook_service_spec.rb @@ -1,4 +1,4 @@ -describe NotificationService::WebhookService, type: 'model' do +describe NotificationServices::WebhookService, type: 'model' do it "it should send a notification to a user-specified URL" do notice = Fabricate :notice notification_service = Fabricate :webhook_notification_service, :app => notice.app -- libgit2 0.21.2