From 7c701acf573f95cce7f8b1b7756de5d73404f09b Mon Sep 17 00:00:00 2001
From: Marin Jankovski <maxlazio@gmail.com>
Date: Fri, 23 Jan 2015 11:01:09 -0800
Subject: Do a check which issue tracker is used inside the project.

---
 spec/models/project_spec.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'spec/models')

diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index 70a15cac1a8..9d633e78187 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -195,16 +195,16 @@ describe Project do
     end
   end
 
-  describe :used_default_issues_tracker? do
+  describe :default_issues_tracker? do
     let(:project) { create(:project) }
     let(:ext_project) { create(:redmine_project) }
 
     it "should be true if used internal tracker" do
-      project.used_default_issues_tracker?.should be_true
+      project.default_issues_tracker?.should be_true
     end
 
     it "should be false if used other tracker" do
-      ext_project.used_default_issues_tracker?.should be_false
+      ext_project.default_issues_tracker?.should be_false
     end
   end
 
-- 
cgit v1.2.1


From 33913f9b8fef1f8df45dc26239faf8fa4cffc982 Mon Sep 17 00:00:00 2001
From: Marin Jankovski <maxlazio@gmail.com>
Date: Mon, 26 Jan 2015 22:08:27 -0800
Subject: Make issue tracker service fields required.

---
 spec/models/jira_service_spec.rb | 83 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 83 insertions(+)
 create mode 100644 spec/models/jira_service_spec.rb

(limited to 'spec/models')

diff --git a/spec/models/jira_service_spec.rb b/spec/models/jira_service_spec.rb
new file mode 100644
index 00000000000..0c73a68c924
--- /dev/null
+++ b/spec/models/jira_service_spec.rb
@@ -0,0 +1,83 @@
+require 'spec_helper'
+
+describe JiraService 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 :project_url }
+      it { should validate_presence_of :issues_url }
+      it { should validate_presence_of :new_issue_url }
+    end
+  end
+
+  describe 'description and title' do
+    let(:project) { create(:project) }
+
+    context 'when it is not set' do
+      before do
+        @service = project.create_jira_service(active: true)
+      end
+
+      after do
+        @service.destroy!
+      end
+
+      it 'should be initialized' do
+        expect(@service.title).to eq('JIRA')
+        expect(@service.description).to eq("Jira issue tracker")
+      end
+    end
+
+    context 'when it is set' do
+      before do
+        properties = { 'title' => 'Jira One', 'description' => 'Jira One issue tracker' }
+        @service = project.create_jira_service(active: true, properties: properties)
+      end
+
+      after do
+        @service.destroy!
+      end
+
+      it "should be correct" do
+        expect(@service.title).to eq('Jira One')
+        expect(@service.description).to eq('Jira One issue tracker')
+      end
+    end
+  end
+
+  describe 'project and issue urls' do
+    let(:project) { create(:project) }
+
+    context 'when gitlab.yml was initialized' do
+      before do
+        settings = { "jira" => {
+          "title" => "Jira",
+          "project_url" => "http://jira.sample/projects/project_a",
+          "issues_url" => "http://jira.sample/issues/:id",
+          "new_issue_url" => "http://jira.sample/projects/project_a/issues/new"
+          }
+        }
+        Gitlab.config.stub(:issues_tracker).and_return(settings)
+        @service = project.create_jira_service(active: true)
+      end
+
+      after do
+        @service.destroy!
+      end
+
+      it 'should be prepopulated with the settings' do
+        expect(@service.properties[:project_url]).to eq('http://jira.sample/projects/project_a')
+        expect(@service.properties[:issues_url]).to eq("http://jira.sample/issues/:id")
+        expect(@service.properties[:new_issue_url]).to eq("http://jira.sample/projects/project_a/issues/new")
+      end
+    end
+  end
+end
-- 
cgit v1.2.1