From bba8e59a044f34a02000b752a70198fb74236b1d Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Mon, 12 Jan 2015 09:08:25 -0800
Subject: Fix test hook and tests

---
 spec/models/pushover_service_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'spec/models/pushover_service_spec.rb')

diff --git a/spec/models/pushover_service_spec.rb b/spec/models/pushover_service_spec.rb
index 59db69d7572..f2813d66c7d 100644
--- a/spec/models/pushover_service_spec.rb
+++ b/spec/models/pushover_service_spec.rb
@@ -36,7 +36,7 @@ describe PushoverService do
     let(:pushover) { PushoverService.new }
     let(:user) { create(:user) }
     let(:project) { create(:project) }
-    let(:sample_data) { GitPushService.new.sample_data(project, user) }
+    let(:sample_data) { Gitlab::PushDataBuilder.build_sample(project, user) }
 
     let(:api_key) { 'verySecret' }
     let(:user_key) { 'verySecret' }
-- 
cgit v1.2.1


From ab6f7164e03139889c09a6a207e9df3481e57b3b Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Fri, 30 Jan 2015 15:40:04 -0500
Subject: Make the structure of spec/models match app/models

---
 spec/models/pushover_service_spec.rb | 69 ------------------------------------
 1 file changed, 69 deletions(-)
 delete mode 100644 spec/models/pushover_service_spec.rb

(limited to 'spec/models/pushover_service_spec.rb')

diff --git a/spec/models/pushover_service_spec.rb b/spec/models/pushover_service_spec.rb
deleted file mode 100644
index f2813d66c7d..00000000000
--- a/spec/models/pushover_service_spec.rb
+++ /dev/null
@@ -1,69 +0,0 @@
-# == Schema Information
-#
-# Table name: services
-#
-#  id         :integer          not null, primary key
-#  type       :string(255)
-#  title      :string(255)
-#  project_id :integer          not null
-#  created_at :datetime
-#  updated_at :datetime
-#  active     :boolean          default(FALSE), not null
-#  properties :text
-#
-
-require 'spec_helper'
-
-describe PushoverService do
-  describe 'Associations' do
-    it { should belong_to :project }
-    it { should have_one :service_hook }
-  end
-
-  describe 'Validations' do
-    context 'active' do
-      before do
-        subject.active = true
-      end
-
-      it { should validate_presence_of :api_key }
-      it { should validate_presence_of :user_key }
-      it { should validate_presence_of :priority }
-    end
-  end
-
-  describe 'Execute' do
-    let(:pushover) { PushoverService.new }
-    let(:user) { create(:user) }
-    let(:project) { create(:project) }
-    let(:sample_data) { Gitlab::PushDataBuilder.build_sample(project, user) }
-
-    let(:api_key) { 'verySecret' }
-    let(:user_key) { 'verySecret' }
-    let(:device) { 'myDevice' }
-    let(:priority) { 0 }
-    let(:sound) { 'bike' }
-    let(:api_url) { 'https://api.pushover.net/1/messages.json' }
-
-    before do
-      pushover.stub(
-        project: project,
-        project_id: project.id,
-        service_hook: true,
-        api_key: api_key,
-        user_key: user_key,
-        device: device,
-        priority: priority,
-        sound: sound
-      )
-
-      WebMock.stub_request(:post, api_url)
-    end
-
-    it 'should call Pushover API' do
-      pushover.execute(sample_data)
-
-      WebMock.should have_requested(:post, api_url).once
-    end
-  end
-end
-- 
cgit v1.2.1