Merge branch 'master' into mmonaco/gitlab-ce-api-user-noconfirm

Conflicts:
	lib/api/users.rb

1 files changed, 31 insertions, 5 deletions

diff --git a/spec/models/service_spec.rb b/spec/models/service_spec.rb
index c96f2b20529..9a1248055b1 100644
--- a/spec/models/service_spec.rb
+++ b/spec/models/service_spec.rb
@@ -5,11 +5,12 @@
 #  id         :integer          not null, primary key
 #  type       :string(255)
 #  title      :string(255)
-#  project_id :integer          not null
+#  project_id :integer
 #  created_at :datetime
 #  updated_at :datetime
 #  active     :boolean          default(FALSE), not null
 #  properties :text
+#  template   :boolean          default(FALSE)
 #
 
 require 'spec_helper'
@@ -17,8 +18,8 @@ require 'spec_helper'
 describe Service do
 
   describe "Associations" do
-    it { should belong_to :project }
-    it { should have_one :service_hook }
+    it { is_expected.to belong_to :project }
+    it { is_expected.to have_one :service_hook }
   end
 
   describe "Mass assignment" do
@@ -40,7 +41,7 @@ describe Service do
       end
 
       describe :can_test do
-        it { @testable.should == true }
+        it { expect(@testable).to eq(true) }
       end
     end
 
@@ -55,7 +56,32 @@ describe Service do
       end
 
       describe :can_test do
-        it { @testable.should == true }
+        it { expect(@testable).to eq(true) }
+      end
+    end
+  end
+
+  describe "Template" do
+    describe "for pushover service" do
+      let(:service_template) {
+        PushoverService.create(template: true, properties: {device: 'MyDevice', sound: 'mic', priority: 4, api_key: '123456789'})
+      }
+      let(:project) { create(:project) }
+
+      describe 'should be prefilled for projects pushover service' do
+        before do
+          service_template
+          project.build_missing_services
+        end
+
+        it "should have all fields prefilled" do
+          service = project.pushover_service
+          expect(service.template).to eq(false)
+          expect(service.device).to eq('MyDevice')
+          expect(service.sound).to eq('mic')
+          expect(service.priority).to eq(4)
+          expect(service.api_key).to eq('123456789')
+        end
       end
     end
   end