created services for keys

6 files changed, 54 insertions, 25 deletions

diff --git a/spec/models/gpg_key_spec.rb b/spec/models/gpg_key_spec.rb
index 9c99c3e5c08..fadc8bfeb61 100644
--- a/spec/models/gpg_key_spec.rb
+++ b/spec/models/gpg_key_spec.rb
@@ -140,18 +140,6 @@ describe GpgKey do
     end
   end
 
-  describe 'notification', :mailer do
-    let(:user) { create(:user) }
-
-    it 'sends a notification' do
-      perform_enqueued_jobs do
-        create(:gpg_key, user: user)
-      end
-
-      should_email(user)
-    end
-  end
-
   describe '#revoke' do
     it 'invalidates all associated gpg signatures and destroys the key' do
       gpg_key = create :gpg_key
diff --git a/spec/models/key_spec.rb b/spec/models/key_spec.rb
index 96baeaff0a4..dbc4aba8547 100644
--- a/spec/models/key_spec.rb
+++ b/spec/models/key_spec.rb
@@ -169,16 +169,4 @@ describe Key, :mailer do
       expect(described_class.new(key: " #{valid_key} ").key).to eq(valid_key)
     end
   end
-
-  describe 'notification' do
-    let(:user) { create(:user) }
-
-    it 'sends a notification' do
-      perform_enqueued_jobs do
-        create(:key, user: user)
-      end
-
-      should_email(user)
-    end
-  end
 end
diff --git a/spec/services/deploy_keys/create_service_spec.rb b/spec/services/deploy_keys/create_service_spec.rb
new file mode 100644
index 00000000000..7a604c0cadd
--- /dev/null
+++ b/spec/services/deploy_keys/create_service_spec.rb
@@ -0,0 +1,12 @@
+require 'spec_helper'
+
+describe DeployKeys::CreateService do
+  let(:user) { create(:user) }
+  let(:params) { attributes_for(:deploy_key) }
+
+  subject { described_class.new(user, params) }
+
+  it "creates a deploy key" do
+    expect { subject.execute }.to change { DeployKey.where(params.merge(user: user)).count }.by(1)
+  end
+end
diff --git a/spec/services/gpg_keys/create_service_spec.rb b/spec/services/gpg_keys/create_service_spec.rb
new file mode 100644
index 00000000000..20382a3a618
--- /dev/null
+++ b/spec/services/gpg_keys/create_service_spec.rb
@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe GpgKeys::CreateService do
+  let(:user) { create(:user) }
+  let(:params) { attributes_for(:gpg_key) }
+
+  subject { described_class.new(user, params) }
+
+  context 'notification', :mailer do
+    it 'sends a notification' do
+      perform_enqueued_jobs do
+        subject.execute
+      end
+      should_email(user)
+    end
+  end
+
+  it 'creates a gpg key' do
+    expect { subject.execute }.to change { user.gpg_keys.where(params).count }.by(1)
+  end
+end
diff --git a/spec/services/keys/create_service_spec.rb b/spec/services/keys/create_service_spec.rb
new file mode 100644
index 00000000000..bcb436c1e46
--- /dev/null
+++ b/spec/services/keys/create_service_spec.rb
@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe Keys::CreateService do
+  let(:user) { create(:user) }
+  let(:params) { attributes_for(:key) }
+
+  subject { described_class.new(user, params) }
+
+  context 'notification', :mailer do
+    it 'sends a notification' do
+      perform_enqueued_jobs do
+        subject.execute
+      end
+      should_email(user)
+    end
+  end
+
+  it 'creates a key' do
+    expect { subject.execute }.to change { user.keys.where(params).count }.by(1)
+  end
+end
diff --git a/spec/services/notification_service_spec.rb b/spec/services/notification_service_spec.rb
index 3e493148b32..f4b36eb7eeb 100644
--- a/spec/services/notification_service_spec.rb
+++ b/spec/services/notification_service_spec.rb
@@ -84,7 +84,6 @@ describe NotificationService, :mailer do
       let!(:key) { create(:personal_key, key_options) }
 
       it { expect(notification.new_key(key)).to be_truthy }
-      it { should_email(key.user) }
 
       describe 'never emails the ghost user' do
         let(:key_options) { { user: User.ghost } }