jirarest2 0.0.6 → 0.0.7

data/lib/{services → jirarest2/services}/issuelink.rb

@@ -15,11 +15,11 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-require "connect"
-require "services"
-require "issue"
-require "services/issuelinktype"
-require "exceptions"
+require_relative "../connect"
+require_relative "../services"
+require_relative "../issue"
+require_relative "issuelinktype"
+require_relative "../exceptions"
 
 #  This class is responsible for the Linking of Issues
 #  No real getter as of yet (I just didn't need it)
@@ -28,6 +28,7 @@ class IssueLink < Services
   def initialize(connection)
     @uritail = "issueLink"
     super(connection)
+    @linktype = IssueLinkType.new(@connection)
   end
 
   private
@@ -44,6 +45,12 @@ class IssueLink < Services
   end
   
   public
+  
+  #Show the possible answers for the issuelinktypes
+  # @return String
+  def valid_issuelinktypes(delimiter = ", ")
+    return @linktype.valid_names(delimiter)
+  end
 
   # Links two issues
   # Right now the visibility feature for comments is not supported
@@ -57,9 +64,8 @@ class IssueLink < Services
     outwardIssue = key(remoteIssue)
     
     # lets see if we have the right name
-    linktype = IssueLinkType.new(@connection)
-    if ! linktype.internal_name?(type) then # time to find the correct name and see if we have to exchange tickets
-      realname = linktype.name(type)
+    if ! @linktype.internal_name?(type) then # time to find the correct name and see if we have to exchange tickets
+      realname = @linktype.name(type)
       if realname.nil? then
         raise Jirarest2::ValueNotAllowedException, type 
       else

data/lib/jirarest2/services/issuelinktype.rb

@@ -0,0 +1,108 @@
+# 
+#    Copyright (C) 2012 Cyril Bitterich
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+require "jirarest2/services"
+
+# Lets try it by making one class for each issue link type and glue them together in a list
+class SingleIssueLinkType
+  # @return [String] Name of the Type
+  attr_reader :name
+  # @return [String] Name of the inward string
+  attr_reader :inward
+  # @return [String] Name of the outward string
+  attr_reader :outward
+
+  # @param [String] name The name of the IssueLinkType
+  # @param [String] inward The name used for inward links
+  # @param [String] outward The name used for outward links
+  def initialize(name,inward,outward)
+    @name = name
+    @inward = inward
+    @outward = outward
+  end
+end
+
+#  An IssueLinkType Object represents one or all IssueLinkTypes
+class IssueLinkType < Services
+
+
+  # @param [Connection] connection
+  # @param [String] data issueLinkType ID 
+  # @return [Jirarest2::Result]
+  def initialize(connection,data = "")
+    if data == "" then
+      @uritail = "issueLinkType"
+    else
+      @uritail = "issueLinkType/#{data}"
+    end
+    super(connection)
+    extract_fields(get) # Build the SingleIssueLinkType classes
+  end
+
+private
+  # Extract the fieldtypes from the Hash we got from the server
+  # As the server does not always return the same structure for single and multi instances we have to do some alignment
+  # @param [Hash] jiraresponse Hash built from the JSON JIRA(tm) returned to us
+  def extract_fields(jiraresponse)
+    @types = Hash.new
+    if jiraresponse["issueLinkTypes"].instance_of?(Array) then
+      jiraresponse["issueLinkTypes"].each{ |hash|
+        @types[hash["name"]] = SingleIssueLinkType.new(hash["name"],hash["inward"],hash["outward"])
+      }
+    else
+      @types[jiraresponse["name"]] = SingleIssueLinkType.new(jiraresponse["name"],jiraresponse["inward"],jiraresponse["outward"])
+    end
+  end
+
+public
+
+  #Get the internal name and direction instead of the one in the UI.
+  # @param [String] uiname the way the linktype is shown in the browser
+  # @return [Array, nil] Array with the name and the direction ("inward" or "outward") if successfull , nil if not
+  def name(uiname)
+    return uiname if @types.has_key?(uiname)  # If the name is already correct just bounce it back
+    @types.each { |name,singletype|
+      if singletype.inward == uiname then
+        return singletype.name, "inward"
+      elsif singletype.outward ==  uiname then
+        return singletype.name, "outward"
+      end
+    }
+    return nil # Nothing found don't want to return @all      
+  end # name
+
+  # Is the name realy the internal name we need to use?
+  # @param [String] test String to test agains the names of IssueLinkTypes
+  # @return [Boolean] 
+  def internal_name?(test)
+    @types.has_key?(test)
+  end
+
+  # Return all valid issuetypefield entries that we now of
+  # @param [String] delimiter Delimiter for the output (if you want ", " or "\n" or ...)
+  # @return [String] All the valid answers
+  def valid_names(delimiter = ", ")
+    answer = Array.new
+    @types.each { |name,singletype|
+      answer << singletype.name
+      answer << singletype.inward
+      answer << singletype.outward
+    }
+    return answer.join(delimiter)
+  end
+
+end #class

data/lib/{services → jirarest2/services}/watcher.rb

@@ -15,8 +15,8 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-require "connect"
-require "services"
+require "jirarest2/connect"
+require "jirarest2/services"
 
 #  Watchers do have their own calling
 class Watcher < Services

data/test/data/issuespec.txt

@@ -0,0 +1,14 @@
+HTTP/1.1 200 OK
+Server: Apache-Coyote/1.1
+X-AREQUESTID: 1205x110x1
+Set-Cookie: JSESSIONID=3D7C4DCDAD212D6D5227E08E5059A347; Path=/
+X-Seraph-LoginReason: OK
+Set-Cookie: atlassian.xsrf.token=BP8Q-WXN6-SKX3-NB5M|09078c4ba23629ddc418efa11cc75a215f98ce1d|lin; Path=/jira
+X-ASESSIONID: 1lodmqg
+X-AUSERNAME: test
+Cache-Control: no-cache, no-store, no-transform
+Content-Type: application/json;charset=UTF-8
+Transfer-Encoding: chunked
+Date: Mon, 23 Jul 2012 18:05:26 GMT
+
+{"expand":"projects","projects":[{"expand":"issuetypes","self":"http://localhost:2990/jira/rest/api/2/project/MFTP","id":"10000","key":"MFTP","name":"My first Test Project","avatarUrls":{"16x16":"http://localhost:2990/jira/secure/projectavatar?size=small&pid=10000&avatarId=10011","48x48":"http://localhost:2990/jira/secure/projectavatar?pid=10000&avatarId=10011"},"issuetypes":[{"self":"http://localhost:2990/jira/rest/api/2/issuetype/6","id":"6","description":"An own issue type","iconUrl":"http://localhost:2990/jira/images/icons/ico_epic.png","name":"My issue type","subtask":false,"expand":"fields","fields":{"summary":{"required":true,"schema":{"type":"string","system":"summary"},"name":"Summary","operations":["set"]},"timetracking":{"required":false,"schema":{"type":"timetracking","system":"timetracking"},"name":"Time Tracking","operations":["set","edit"]},"customfield_10102":{"required":false,"schema":{"type":"string","custom":"com.atlassian.jira.plugin.system.customfieldtypes:textfield","customId":10102},"name":"projects","operations":["set"]},"customfield_10101":{"required":false,"schema":{"type":"string","custom":"com.atlassian.jira.plugin.system.customfieldtypes:textfield","customId":10101},"name":"Issue Type","operations":["set"]},"customfield_10100":{"required":false,"schema":{"type":"string","custom":"com.atlassian.jira.plugin.system.customfieldtypes:textfield","customId":10100},"name":"issuetype","operations":["set"]},"issuetype":{"required":true,"schema":{"type":"issuetype","system":"issuetype"},"name":"Issue Type","operations":[],"allowedValues":[{"self":"http://localhost:2990/jira/rest/api/2/issuetype/6","id":"6","description":"An own issue type","iconUrl":"http://localhost:2990/jira/images/icons/ico_epic.png","name":"My issue type","subtask":false}]},"customfield_10006":{"required":false,"schema":{"type":"string","custom":"com.atlassian.jira.plugin.system.customfieldtypes:select","customId":10006},"name":"List select","operations":["set"],"allowedValues":[{"self":"http://localhost:2990/jira/rest/api/2/customFieldOption/10015","value":"Räuber","id":"10015"},{"self":"http://localhost:2990/jira/rest/api/2/customFieldOption/10016","value":"Kabale und Liebe","id":"10016"},{"self":"http://localhost:2990/jira/rest/api/2/customFieldOption/10017","value":"Faust","id":"10017"},{"self":"http://localhost:2990/jira/rest/api/2/customFieldOption/10018","value":"Landleben","id":"10018"}]},"customfield_10005":{"required":false,"schema":{"type":"array","items":"string","custom":"com.atlassian.jira.plugin.system.customfieldtypes:multiselect","customId":10005},"name":"Multi Select","operations":["add","set","remove"],"allowedValues":[{"self":"http://localhost:2990/jira/rest/api/2/customFieldOption/10023","value":"Glocke","id":"10023"},{"self":"http://localhost:2990/jira/rest/api/2/customFieldOption/10024","value":"Kabale und Liebe","id":"10024"},{"self":"http://localhost:2990/jira/rest/api/2/customFieldOption/10025","value":"Schiller","id":"10025"},{"self":"http://localhost:2990/jira/rest/api/2/customFieldOption/10026","value":"Göthe","id":"10026"},{"self":"http://localhost:2990/jira/rest/api/2/customFieldOption/10027","value":"Faust","id":"10027"}]},"labels":{"required":false,"schema":{"type":"array","items":"string","system":"labels"},"name":"Labels","autoCompleteUrl":"http://localhost:2990/jira/rest/api/1.0/labels/suggest?query=","operations":["add","set","remove"]},"resolution":{"required":false,"schema":{"type":"resolution","system":"resolution"},"name":"Resolution","operations":["set"],"allowedValues":[{"self":"http://localhost:2990/jira/rest/api/2/resolution/1","name":"Fixed","id":"1"},{"self":"http://localhost:2990/jira/rest/api/2/resolution/2","name":"Won't Fix","id":"2"},{"self":"http://localhost:2990/jira/rest/api/2/resolution/3","name":"Duplicate","id":"3"},{"self":"http://localhost:2990/jira/rest/api/2/resolution/4","name":"Incomplete","id":"4"},{"self":"http://localhost:2990/jira/rest/api/2/resolution/5","name":"Cannot Reproduce","id":"5"}]},"attachment":{"required":false,"schema":{"type":"array","items":"attachment","system":"attachment"},"name":"Attachment","operations":[]},"project":{"required":true,"schema":{"type":"project","system":"project"},"autoCompleteUrl":"Project","operations":["set"],"allowedValues":[{"self":"http://localhost:2990/jira/rest/api/2/project/MFTP","id":"10000","key":"MFTP","name":"My first Test Project","avatarUrls":{"16x16":"http://localhost:2990/jira/secure/projectavatar?size=small&pid=10000&avatarId=10011","48x48":"http://localhost:2990/jira/secure/projectavatar?pid=10000&avatarId=10011"}}]},"versions":{"required":false,"schema":{"type":"array","items":"version","system":"versions"},"name":"Affects Version/s","operations":["set","add","remove"],"allowedValues":[]},"environment":{"required":false,"schema":{"type":"string","system":"environment"},"name":"Environment","operations":["set"]},"priority":{"required":false,"schema":{"type":"priority","system":"priority"},"name":"Priority","operations":["set"],"allowedValues":[{"self":"http://localhost:2990/jira/rest/api/2/priority/1","iconUrl":"http://localhost:2990/jira/images/icons/priority_blocker.gif","name":"Blocker","id":"1"},{"self":"http://localhost:2990/jira/rest/api/2/priority/2","iconUrl":"http://localhost:2990/jira/images/icons/priority_critical.gif","name":"Critical","id":"2"},{"self":"http://localhost:2990/jira/rest/api/2/priority/3","iconUrl":"http://localhost:2990/jira/images/icons/priority_major.gif","name":"Major","id":"3"},{"self":"http://localhost:2990/jira/rest/api/2/priority/4","iconUrl":"http://localhost:2990/jira/images/icons/priority_minor.gif","name":"Minor","id":"4"},{"self":"http://localhost:2990/jira/rest/api/2/priority/5","iconUrl":"http://localhost:2990/jira/images/icons/priority_trivial.gif","name":"Trivial","id":"5"}]},"description":{"required":false,"schema":{"type":"string","system":"description"},"name":"Description","operations":["set"]},"customfield_10001":{"required":false,"schema":{"type":"datetime","custom":"com.atlassian.jira.plugin.system.customfieldtypes:datetime","customId":10001},"name":"Date Time Field","operations":["set"]},"customfield_10002":{"required":false,"schema":{"type":"date","custom":"com.atlassian.jira.plugin.system.customfieldtypes:datepicker","customId":10002},"name":"Date Picker","operations":["set"]},"customfield_10003":{"required":false,"schema":{"type":"string","custom":"com.atlassian.jira.plugin.system.customfieldtypes:textarea","customId":10003},"name":"Großes Text","operations":["set"]},"customfield_10004":{"required":false,"schema":{"type":"array","items":"string","custom":"com.atlassian.jira.plugin.system.customfieldtypes:multicheckboxes","customId":10004},"name":"Multi Checkboxes","operations":["add","set","remove"],"allowedValues":[{"self":"http://localhost:2990/jira/rest/api/2/customFieldOption/10019","value":"Göthe","id":"10019"},{"self":"http://localhost:2990/jira/rest/api/2/customFieldOption/10020","value":"Schiller","id":"10020"},{"self":"http://localhost:2990/jira/rest/api/2/customFieldOption/10021","value":"Heine","id":"10021"},{"self":"http://localhost:2990/jira/rest/api/2/customFieldOption/10022","value":"Kafka","id":"10022"}]},"components":{"required":false,"schema":{"type":"array","items":"component","system":"components"},"name":"Component/s","operations":["add","set","remove"],"allowedValues":[]},"customfield_10000":{"required":false,"schema":{"type":"array","items":"string","custom":"com.atlassian.jira.plugin.system.customfieldtypes:cascadingselect","customId":10000},"name":"Cascading Select Test","operations":["set"],"allowedValues":[{"self":"http://localhost:2990/jira/rest/api/2/customFieldOption/10000","value":"English","id":"10000","children":[{"self":"http://localhost:2990/jira/rest/api/2/customFieldOption/10003","value":"One","id":"10003"},{"self":"http://localhost:2990/jira/rest/api/2/customFieldOption/10004","value":"Two","id":"10004"},{"self":"http://localhost:2990/jira/rest/api/2/customFieldOption/10005","value":"Three","id":"10005"},{"self":"http://localhost:2990/jira/rest/api/2/customFieldOption/10006","value":"Four","id":"10006"}]},{"self":"http://localhost:2990/jira/rest/api/2/customFieldOption/10001","value":"German","id":"10001","children":[{"self":"http://localhost:2990/jira/rest/api/2/customFieldOption/10007","value":"Eins","id":"10007"},{"self":"http://localhost:2990/jira/rest/api/2/customFieldOption/10008","value":"zwei","id":"10008"},{"self":"http://localhost:2990/jira/rest/api/2/customFieldOption/10009","value":"drEi","id":"10009"},{"self":"http://localhost:2990/jira/rest/api/2/customFieldOption/10010","value":"vier","id":"10010"}]},{"self":"http://localhost:2990/jira/rest/api/2/customFieldOption/10002","value":"ISO","id":"10002","children":[{"self":"http://localhost:2990/jira/rest/api/2/customFieldOption/10011","value":"Unaone","id":"10011"},{"self":"http://localhost:2990/jira/rest/api/2/customFieldOption/10012","value":"Bissotwo","id":"10012"},{"self":"http://localhost:2990/jira/rest/api/2/customFieldOption/10013","value":"Terrathree","id":"10013"},{"self":"http://localhost:2990/jira/rest/api/2/customFieldOption/10014","value":"Kartefour","id":"10014"}]}]}}}]}]}

data/test/test_connect.rb

@@ -1,6 +1,7 @@
 require "minitest/autorun"
-require "connect"
-require "credentials"
+require "jirarest2/connect"
+require "jirarest2/credentials"
+require "webmock/minitest"
 
 class TestConnect < MiniTest::Unit::TestCase
   def setup
@@ -8,24 +9,37 @@ class TestConnect < MiniTest::Unit::TestCase
     @con = Connect.new(cred)
   end
   
+  def test_access
+    stub_request(:any,"http://localhost:2990/jiar/rest/api/2/").with(:headers => {"Content-Type:" => "application/json;charset=UTF-8"})
+  end
 
-  def test_executeGET
+  def test_executeGET    
+    stub_request(:get, "http://test:1234@localhost:2990/jira/rest/api/2/issue/createmeta/").with(:headers => {'Accept'=>'*/*', 'Content-Type'=>'application/json;charset=UTF-8', 'User-Agent'=>'Ruby'}).to_return(:status => 200, :body => "", :headers => {})
     assert "projects", @con.execute("Get","issue/createmeta/","").result["expand"]
   end
   
   def test_executePOST
+    stub_request(:post, "http://test:1234@localhost:2990/jira/rest/api/2/search/").with(:body => "{\"jql\":\"project = MFTP\",\"startAt\":0,\"maxResults\":4}",:headers => {'Accept'=>'*/*', 'Content-Type'=>'application/json;charset=UTF-8', 'User-Agent'=>'Ruby'}).to_return(:status => 200, :body => "", :headers => {})
+
     query={"jql"=>"project = MFTP", "startAt"=>0, "maxResults"=>4 }
     assert 4, @con.execute("Post","search/",query).result["maxResults"]
   end
 
-  def test_check_uri
+  def test_check_uri_true
+    stub_request(:get, "http://test:1234@localhost:2990/jira/rest/api/2/dashboard").with(:headers => {'Accept'=>'*/*', 'Content-Type'=>'application/json;charset=UTF-8', 'User-Agent'=>'Ruby'}).to_return(:status => 200, :body => "", :headers => {})
     assert_equal true,@con.check_uri
+  end
+  
+  def test_check_uri_false
+    stub_request(:get, "http://test:1234@localhost:2990/rest/api/2/dashboard").with(:headers => {'Accept'=>'*/*', 'Content-Type'=>'application/json;charset=UTF-8', 'User-Agent'=>'Ruby'}).to_return(:status => 400, :body => "", :headers => {})
     cred = Credentials.new("http://localhost:2990/rest/api/2/","test","1234")
     con1 = Connect.new(cred)
     assert_equal false,con1.check_uri
   end
   
   def test_heal_uri
+    stub_request(:get, "http://test:1234@localhost:2990/jira/rest/api/2/dashboard").with(:headers => {'Accept'=>'*/*', 'Content-Type'=>'application/json;charset=UTF-8', 'User-Agent'=>'Ruby'}).to_return(:status => 200, :body => "", :headers => {})
+
     cred = Credentials.new("http://localhost:2990/jira//rest/api//2//","test","1234")
     con = Connect.new(cred)
     assert_equal "http://localhost:2990/jira/rest/api/2/",con.heal_uri
@@ -40,13 +54,22 @@ class TestConnect < MiniTest::Unit::TestCase
     assert_equal "http://localhost:2990/secure/Dashboard.jspa",con.heal_uri("http://localhost:2990/secure/Dashboard.jspa") # If there is no Rest-Path at this point we have a problem
   end
 
-  def test_heal_uri!
+  def test_working_heal_uri!
+
+    stub_request(:get, "http://test:1234@localhost:2990/jira//rest/api//2//dashboard").with(:headers => {'Accept'=>'*/*', 'Content-Type'=>'application/json;charset=UTF-8', 'User-Agent'=>'Ruby'}).to_return(:status => 404, :body => '<?xml version="1.0" encoding="UTF-8" standalone="yes"?><status><status-code>404</status-code><message>null for uri: http://localhost:2990/jira//rest/api//2//dashboard</message></status>', :headers => {"X-AUSERNAME" => "test" })
+
     ## First an URL we can fix
     cred = Credentials.new("http://localhost:2990/jira//rest/api//2//","test","1234")
     con = Connect.new(cred)
     assert_equal false,con.check_uri
+    
+    stub_request(:get, "http://test:1234@localhost:2990/jira/rest/api/2/dashboard").with(:headers => {'Accept'=>'*/*', 'Content-Type'=>'application/json;charset=UTF-8', 'User-Agent'=>'Ruby'}).to_return(:status => 200, :body => "", :headers => {})
     assert_equal "http://localhost:2990/jira/rest/api/2/", con.heal_uri!
     assert_equal true,con.check_uri
+  end
+  
+  def test_notworking_heal_uri!
+    stub_request(:get, "http://test:1234@localhost:2990/secure/Dashboard.jspadashboard").with(:headers => {'Accept'=>'*/*', 'Content-Type'=>'application/json;charset=UTF-8', 'User-Agent'=>'Ruby'}).to_return(:status => 400, :body => "", :headers => {})
     ## And now one we cant't fix
     cred = Credentials.new("http://localhost:2990/secure/Dashboard.jspa","test","1234")
     con = Connect.new(cred)

data/test/test_issue.rb

@@ -1,21 +1,26 @@
 # -*- coding: utf-8 -*-
 require "minitest/autorun"
 require "jirarest2"
+require "webmock/minitest"
 
 class TestIssue < MiniTest::Unit::TestCase
   def setup
     @credentials = Credentials.new("http://localhost:2990/jira/rest/api/2/","test","1234")
     @connect = Connect.new(@credentials)
+    raw_response_file = File.new(File.dirname(__FILE__)+"/data/issuespec.txt")
+    stub_request(:get, "http://test:1234@localhost:2990/jira/rest/api/2/issue/createmeta/?expand=projects.issuetypes.fields&issuetypeNames=My%20issue%20type&projectKeys=MFTP").with(:headers => {'Accept'=>'*/*', 'Content-Type'=>'application/json;charset=UTF-8', 'User-Agent'=>'Ruby'}).to_return(raw_response_file)
     @existentIssue = Issue.new("MFTP","My issue type",@connect)
   end
 
   def testNonExistentProject
+    stub_request(:get, "http://test:1234@localhost:2990/jira/rest/api/2/issue/createmeta/?expand=projects.issuetypes.fields&issuetypeNames=fasel&projectKeys=blubber").with(:headers => {'Accept'=>'*/*', 'Content-Type'=>'application/json;charset=UTF-8', 'User-Agent'=>'Ruby'}).to_return(:status => 200, :body => '{"expand":"projects","projects":[]}', :headers => {})
     assert_raises(Jirarest2::WrongProjectException) {
       nonexistentProject = Issue.new("blubber","fasel",@connect)
     }
   end
-  
+
   def testNonExistentIssuetype
+    stub_request(:get, "http://test:1234@localhost:2990/jira/rest/api/2/issue/createmeta/?expand=projects.issuetypes.fields&issuetypeNames=fasel&projectKeys=MFTP").with(:headers => {'Accept'=>'*/*', 'Content-Type'=>'application/json;charset=UTF-8', 'User-Agent'=>'Ruby'}).to_return(:status => 200, :body => '{"expand":"projects","projects":[{"expand":"issuetypes","self":"http://localhost:2990/jira/rest/api/2/project/MFTP","id":"10000","key":"MFTP","name":"My first Test Project","avatarUrls":{"16x16":"http://localhost:2990/jira/secure/projectavatar?size=small&pid=10000&avatarId=10011","48x48":"http://localhost:2990/jira/secure/projectavatar?pid=10000&avatarId=10011"},"issuetypes":[]}]}', :headers => {})
     assert_raises(Jirarest2::WrongIssuetypeException) {
       nonexistentIssue = Issue.new("MFTP","fasel",@connect)
     }
@@ -48,5 +53,6 @@ class TestIssue < MiniTest::Unit::TestCase
     assert_equal "MFTP", blankissue["fields"]["project"]["key"]
     assert_equal "Summary Text", issue.get_field("Summary")
   end
+
   
 end

data/test/test_issuelink.rb

@@ -1,31 +1,56 @@
 # -*- coding: utf-8 -*-
 require "minitest/autorun"
-require "credentials"
-require "connect"
-require "services/issuelink"
+require "jirarest2/credentials"
+require "jirarest2/connect"
+require "jirarest2/services/issuelink"
+require "webmock/minitest"
+
 
 class TestIssueLink < MiniTest::Unit::TestCase
   def setup
     cred = Credentials.new("http://localhost:2990/jira/rest/api/2/","test","1234")
     @con = Connect.new(cred)
+    stub_request(:get, "http://test:1234@localhost:2990/jira/rest/api/2/issueLinkType").with(:headers => {'Accept'=>'*/*', 'Content-Type'=>'application/json;charset=UTF-8', 'User-Agent'=>'Ruby'}).to_return(:status => 200, :body => '{"issueLinkTypes":[{"id":"10000","name":"Blocks","inward":"is blocked by","outward":"blocks","self":"http://localhost:2990/jira/rest/api/2/issueLinkType/10000"},{"id":"10001","name":"Cloners","inward":"is cloned by","outward":"clones","self":"http://localhost:2990/jira/rest/api/2/issueLinkType/10001"},{"id":"10002","name":"Duplicate","inward":"is duplicated by","outward":"duplicates","self":"http://localhost:2990/jira/rest/api/2/issueLinkType/10002"},{"id":"10003","name":"Relates","inward":"relates to","outward":"relates to","self":"http://localhost:2990/jira/rest/api/2/issueLinkType/10003"}]}', :headers => {})
+    @link = IssueLink.new(@con)
   end
 
-  def test_link_issue
-    link = IssueLink.new(@con)
+
+  def test_link_issue_access
     # check for right to link.
+    stub_request(:post, "http://test:1234@localhost:2990/jira/rest/api/2/issueLink").with(:body => "{\"type\":{\"name\":\"Blocks\"},\"inwardIssue\":{\"key\":\"MFTP-6\"},\"outwardIssue\":{\"key\":\"SP-2\"}}",:headers => {'Accept'=>'*/*', 'Content-Type'=>'application/json;charset=UTF-8', 'User-Agent'=>'Ruby'}).to_return(:status => 401, :body => '{"errorMessages":["No Link Issue Permission for issue \'MFTP-6\'"],"errors":{}}', :headers => {})
     assert_raises(Jirarest2::AuthentificationError) {
-      link.link_issue("MFTP-6","SP-2","Blocks")
+      @link.link_issue("MFTP-6","SP-2","Blocks")
     }
+  end
+
+  def test_link_issue_badlinktype
     # check for bullshio issuelinktype
     assert_raises(Jirarest2::ValueNotAllowedException) {
-      link.link_issue("SP-2","MFTP-6","Building")
+        @link.link_issue("SP-2","MFTP-6","Building")
     }
+  end
+
+  def test_link_issue_byname
     # check for Basic link
-    assert "201",link.link_issue("SP-2","MFTP-6","Blocks").code
+    stub_request(:post, "http://test:1234@localhost:2990/jira/rest/api/2/issueLink").with(:body => "{\"type\":{\"name\":\"Blocks\"},\"inwardIssue\":{\"key\":\"SP-2\"},\"outwardIssue\":{\"key\":\"MFTP-6\"}}",:headers => {'Accept'=>'*/*', 'Content-Type'=>'application/json;charset=UTF-8', 'User-Agent'=>'Ruby'}).to_return(:status => 201, :body => "", :headers => {})
+    assert_equal "201",@link.link_issue("SP-2","MFTP-6","Blocks").code
+  end
+
+  def test_link_issue_byuiname
     # Check for link type by name
-    assert "201",link.link_issue("SP-2","MFTP-6","clones").code
+    stub_request(:post, "http://test:1234@localhost:2990/jira/rest/api/2/issueLink").with(:body => "{\"type\":{\"name\":\"Cloners\"},\"inwardIssue\":{\"key\":\"SP-2\"},\"outwardIssue\":{\"key\":\"MFTP-6\"}}",:headers => {'Accept'=>'*/*', 'Content-Type'=>'application/json;charset=UTF-8', 'User-Agent'=>'Ruby'}).to_return(:status => 201, :body => "", :headers => {})
+    assert_equal "201",@link.link_issue("SP-2","MFTP-6","clones").code
+  end
+
+  def test_link_issue_changearound
     # Check for twisted "only onw way for links policy with jira", MFTP-6 to SP-3 would result in AuthError
-    assert "201",link.link_issue("MFTP-6","SP-3","is cloned by")
+    stub_request(:post, "http://test:1234@localhost:2990/jira/rest/api/2/issueLink").with(:body => "{\"type\":{\"name\":\"Cloners\"},\"inwardIssue\":{\"key\":\"SP-3\"},\"outwardIssue\":{\"key\":\"MFTP-6\"}}", :headers => {'Accept'=>'*/*', 'Content-Type'=>'application/json;charset=UTF-8', 'User-Agent'=>'Ruby'}).to_return(:status => 201, :body => "", :headers => {})
+    assert_equal "201",@link.link_issue("MFTP-6","SP-3","is cloned by").code
   end
-  
+
+  def test_valid_issuelinktype
+     block = Regexp.new("blocks, Cloners, is cloned by,")
+     assert_match block, @link.valid_issuelinktypes
+  end
+
 end

data/test/test_issuelinktype.rb

@@ -1,8 +1,9 @@
 # -*- coding: utf-8 -*-
 require "minitest/autorun"
-require "credentials"
-require "connect"
-require "services/issuelinktype"
+require "jirarest2/credentials"
+require "jirarest2/connect"
+require "jirarest2/services/issuelinktype"
+require "webmock/minitest"
 
 
 class TestIssueLinkType < MiniTest::Unit::TestCase
@@ -11,25 +12,49 @@ class TestIssueLinkType < MiniTest::Unit::TestCase
     @con = Connect.new(cred)
   end
 
-  def test_name
+  def test_single_name
+    stub_request(:get, "http://test:1234@localhost:2990/jira/rest/api/2/issueLinkType/10000").with(:headers => {'Accept'=>'*/*', 'Content-Type'=>'application/json;charset=UTF-8', 'User-Agent'=>'Ruby'}).to_return(:status => 200, :body => '{"id":"10000","name":"Blocks","inward":"is blocked by","outward":"blocks","self":"http://localhost:2990/jira/rest/api/2/issueLinkType/10000"}', :headers => {})
     singlelinktype = IssueLinkType.new(@con,"10000")
-    linktype = IssueLinkType.new(@con)
     assert_equal "10000", singlelinktype.get["id"]
     assert_equal ["Blocks", "outward"], singlelinktype.name("blocks")
     assert_equal ["Blocks", "inward"], singlelinktype.name("is blocked by")
+  end
+  def test_multiple_name
+    stub_request(:get, "http://test:1234@localhost:2990/jira/rest/api/2/issueLinkType").with(:headers => {'Accept'=>'*/*', 'Content-Type'=>'application/json;charset=UTF-8', 'User-Agent'=>'Ruby'}).to_return(:status => 200, :body => '{"issueLinkTypes":[{"id":"10000","name":"Blocks","inward":"is blocked by","outward":"blocks","self":"http://localhost:2990/jira/rest/api/2/issueLinkType/10000"},{"id":"10001","name":"Cloners","inward":"is cloned by","outward":"clones","self":"http://localhost:2990/jira/rest/api/2/issueLinkType/10001"},{"id":"10002","name":"Duplicate","inward":"is duplicated by","outward":"duplicates","self":"http://localhost:2990/jira/rest/api/2/issueLinkType/10002"},{"id":"10003","name":"Relates","inward":"relates to","outward":"relates to","self":"http://localhost:2990/jira/rest/api/2/issueLinkType/10003"}]}', :headers => {})
+    linktype = IssueLinkType.new(@con)
     assert_equal ["Cloners", "outward"], linktype.name("clones")
     assert_equal ["Cloners", "inward"], linktype.name("is cloned by")
     assert_equal nil, linktype.name("unknown")
   end
 
   def test_internal_name?
+    stub_request(:get, "http://test:1234@localhost:2990/jira/rest/api/2/issueLinkType/10000").with(:headers => {'Accept'=>'*/*', 'Content-Type'=>'application/json;charset=UTF-8', 'User-Agent'=>'Ruby'}).to_return(:status => 200, :body => '{"id":"10000","name":"Blocks","inward":"is blocked by","outward":"blocks","self":"http://localhost:2990/jira/rest/api/2/issueLinkType/10000"}', :headers => {})
     singlelinktype = IssueLinkType.new(@con,"10000")
     assert_equal false,singlelinktype.internal_name?("blocks")
     assert_equal true, singlelinktype.internal_name?("Blocks")
+  end
+  def test_multiple_internal_name
+    stub_request(:get, "http://test:1234@localhost:2990/jira/rest/api/2/issueLinkType").with(:headers => {'Accept'=>'*/*', 'Content-Type'=>'application/json;charset=UTF-8', 'User-Agent'=>'Ruby'}).to_return(:status => 200, :body => '{"issueLinkTypes":[{"id":"10000","name":"Blocks","inward":"is blocked by","outward":"blocks","self":"http://localhost:2990/jira/rest/api/2/issueLinkType/10000"},{"id":"10001","name":"Cloners","inward":"is cloned by","outward":"clones","self":"http://localhost:2990/jira/rest/api/2/issueLinkType/10001"},{"id":"10002","name":"Duplicate","inward":"is duplicated by","outward":"duplicates","self":"http://localhost:2990/jira/rest/api/2/issueLinkType/10002"},{"id":"10003","name":"Relates","inward":"relates to","outward":"relates to","self":"http://localhost:2990/jira/rest/api/2/issueLinkType/10003"}]}', :headers => {})
     linktype = IssueLinkType.new(@con)
     assert_equal false,linktype.internal_name?("blocks")
     assert_equal true, linktype.internal_name?("Cloners")
+  end
+  
+  def test_single_valid_names
+    stub_request(:get, "http://test:1234@localhost:2990/jira/rest/api/2/issueLinkType/10000").with(:headers => {'Accept'=>'*/*', 'Content-Type'=>'application/json;charset=UTF-8', 'User-Agent'=>'Ruby'}).to_return(:status => 200, :body => '{"id":"10000","name":"Blocks","inward":"is blocked by","outward":"blocks","self":"http://localhost:2990/jira/rest/api/2/issueLinkType/10000"}', :headers => {})
+    singlelinktype = IssueLinkType.new(@con,"10000")
+    assert_equal "Blocks, is blocked by, blocks",singlelinktype.valid_names
+  end
+  def test_multiple_valid_names
+    stub_request(:get, "http://test:1234@localhost:2990/jira/rest/api/2/issueLinkType").with(:headers => {'Accept'=>'*/*', 'Content-Type'=>'application/json;charset=UTF-8', 'User-Agent'=>'Ruby'}).to_return(:status => 200, :body => '{"issueLinkTypes":[{"id":"10000","name":"Blocks","inward":"is blocked by","outward":"blocks","self":"http://localhost:2990/jira/rest/api/2/issueLinkType/10000"},{"id":"10001","name":"Cloners","inward":"is cloned by","outward":"clones","self":"http://localhost:2990/jira/rest/api/2/issueLinkType/10001"},{"id":"10002","name":"Duplicate","inward":"is duplicated by","outward":"duplicates","self":"http://localhost:2990/jira/rest/api/2/issueLinkType/10002"},{"id":"10003","name":"Relates","inward":"relates to","outward":"relates to","self":"http://localhost:2990/jira/rest/api/2/issueLinkType/10003"}]}', :headers => {})
+
+    linktype = IssueLinkType.new(@con)
+    block = Regexp.new("blocks, Cloners, is cloned by,")
+    assert_match block,  linktype.valid_names
+    block = Regexp.new("blocks\nCloners\nis cloned by\n")
+    assert_match block, linktype.valid_names("\n")
     
   end
+
   
 end

data/test/test_madbitconfig.rb

@@ -1,12 +1,12 @@
 require "minitest/autorun"
-require "madbitconfig"
+require "jirarest2/madbitconfig"
 require "pp"
 
 class TestConfig < MiniTest::Unit::TestCase
 
   def test_read_configfile
-    testdir =  File.dirname($0)
-    testfile = testdir + "/test/data/test.config.data"
+    testdir =  File.dirname(__FILE__)
+    testfile = testdir + "/data/test.config.data"
     # Should work
     testdata = {"username"=>"UsErNaMe", "password"=>"pAsSw0rD;", "URL"=>"https://jira.localhost:2990/jira"}
     assert_equal testdata,MadbitConfig::read_configfile(testfile)
@@ -15,8 +15,8 @@ class TestConfig < MiniTest::Unit::TestCase
   end
 
   def test_write_configfile
-    testdir =  File.dirname($0)
-    testfile = testdir + "/test/data/test.config.tmp"
+    testdir =  File.dirname(__FILE__)
+    testfile = testdir + "/data/test.config.tmp"
     #make sure
     File.delete(testfile) if File.exists?(testfile) 
     #test
@@ -30,12 +30,12 @@ class TestConfig < MiniTest::Unit::TestCase
   end
 
   def test_readjfile
-    testdir = File.dirname($0)
-    testfile =  testdir + "/test/data/test.json"
+    testdir = File.dirname(__FILE__)
+    testfile =  testdir + "/data/test.json"
     assert_equal ["One", "Two", "Three", "Four"],MadbitConfig::read_configfile(testfile)["Many Values"]
-    testfile =  testdir + "/test/data/test.nojson"
+    testfile =  testdir + "/data/test.nojson"
     assert_equal " \\This is a summary. We prefer to use it, as is\\", MadbitConfig::read_configfile(testfile, true)["\\Summary\\ "] # Not really what we want but didn't know how to fix now
-    testfile =  testdir + "/test/data/test.nojson1"
+    testfile =  testdir + "/data/test.nojson1"
     assert_equal " One, Two, Three, Four",MadbitConfig::read_configfile(testfile, true)["Many Values "]
     
     # I dont' know how to run this test in a automated setup. How do we feed one of the files above to STDIN so the testscript gets the data?