testdroid-api-client 0.5.0 → 0.6.0

data/spec/label_groups_spec.rb

@@ -18,7 +18,7 @@ describe TestdroidAPI::LabelGroups do
 
   it 'create label group' do
     VCR.use_cassette(File.basename(__FILE__).split('_spec')[0] + '_create') do
-      label_group = client_local_host.label_groups.create({:params => {:displayName => 'Empty', :name => 'empty'}})
+      label_group = client_local_host.label_groups.create({:displayName => 'Empty', :name => 'empty'})
       LG_ID = label_group.id
     end
   end
@@ -27,7 +27,7 @@ describe TestdroidAPI::LabelGroups do
     VCR.use_cassette(File.basename(__FILE__).split('_spec')[0] + '_get_one') do
       label_group = client_local_host.label_groups.get(LG_ID)
       expect(label_group.id).to be(LG_ID)
-      expect(label_group.display_name).to eq("Empty")
+      expect(label_group.display_name).to eq('Empty')
     end
   end
 

data/spec/projects_spec.rb

@@ -11,7 +11,7 @@ describe TestdroidAPI::Project do
 
   it 'create project' do
     VCR.use_cassette(File.basename(__FILE__).split('_spec')[0] + '_create') do
-      project = @user.projects.create({:params => {:name => 'My Project'}})
+      project = @user.projects.create({:name => 'My Project'})
       expect(project.name).to eq 'My Project'
       P_ID = project.id
     end

data/spec/runs_spec.rb

@@ -12,11 +12,13 @@ describe TestdroidAPI::Project do
 
   it 'start test run' do
     VCR.use_cassette(File.basename(__FILE__).split('_spec')[0] + '_start_run') do
-      framework_id = @user.available_frameworks.list({:filter => "s_osType_eq_ANDROID;s_name_like_%AppCrawler"})[0].id
-      app_file_id = @user.files.upload(File.join(File.dirname(__FILE__), 'fixtures', 'apk.apk')).id
+      framework_id = @user.available_frameworks.list({:filter => "s_osType_eq_ANDROID;s_name_like_%Android Instrumentation"})[0].id
+      app_file_id = @user.files.upload(File.join(File.dirname(__FILE__), 'fixtures', 'app.apk')).id
+      test_file_id = @user.files.upload(File.join(File.dirname(__FILE__), 'fixtures', 'test.apk')).id
 
       test_run = @user.runs.create("{\"osType\": \"ANDROID\", \"projectName\": \"My new Project\",
-          \"frameworkId\":#{framework_id}, \"files\": [{\"id\": #{app_file_id}, \"action\": \"INSTALL\" }]}")
+          \"frameworkId\":#{framework_id}, \"files\": [{\"id\": #{app_file_id}, \"action\": \"INSTALL\" },
+           {\"id\": #{test_file_id}, \"action\": \"RUN_TEST\" }]}")
 
       P_ID = test_run.project_id
       TR_ID = test_run.id
@@ -26,7 +28,7 @@ describe TestdroidAPI::Project do
   it 'get project test runs' do
     VCR.use_cassette(File.basename(__FILE__).split('_spec')[0] + '_get_project_runs') do
       test_runs = @user.projects.get(P_ID).runs
-      expect(test_runs.total).to eq(1)
+	  expect(test_runs.total).to satisfy {|n| n > 0}
     end
   end
 

data/spec/spec_helper.rb

@@ -20,14 +20,14 @@ end
 
 def client 
 	@client ||= begin
-		client = Client.new('defaultuser', 'password')
+		client = ApikeyClient.new('API_KEY')
 	rescue Exception => e
 	end
 end
 
 def client_local_host(local_cloud='http://localhost/testdroid-cloud')
 	@client_local_host ||= begin
-		client_local_host = Client.new('admin@localhost', 'admin', local_cloud)
+		client_local_host = ApikeyClient.new('API_KEY', local_cloud)
 	rescue Exception => e
 	end
 end

data/testdroid-api-client.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name               = "testdroid-api-client"
-  s.version            = "0.5.0"
+  s.version            = "0.6.0"
 
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testdroid-api-client
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Sakari Rautiainen
@@ -192,7 +192,6 @@ files:
 - lib/testdroid_api/admin_device_statuses.rb
 - lib/testdroid_api/admin_devices.rb
 - lib/testdroid_api/apikey_client.rb
-- lib/testdroid_api/client.rb
 - lib/testdroid_api/cloud_list_resource.rb
 - lib/testdroid_api/cloud_resource.rb
 - lib/testdroid_api/device_groups.rb
@@ -214,7 +213,7 @@ files:
 - spec/client_spec.rb
 - spec/device_groups_spec.rb
 - spec/files_spec.rb
-- spec/fixtures/apk.apk
+- spec/fixtures/app.apk
 - spec/fixtures/cassettes/device_groups_authorize.json
 - spec/fixtures/cassettes/device_groups_create.json
 - spec/fixtures/cassettes/device_groups_delete.json
@@ -243,6 +242,7 @@ files:
 - spec/fixtures/cassettes/runs_start_run.json
 - spec/fixtures/data.txt
 - spec/fixtures/data2.txt
+- spec/fixtures/test.apk
 - spec/label_groups_spec.rb
 - spec/projects_spec.rb
 - spec/runs_spec.rb
@@ -267,8 +267,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.3.5
 signing_key: 
 specification_version: 3
 summary: Testdroid API Client!

data/lib/testdroid_api/client.rb

@@ -1,161 +0,0 @@
-module TestdroidAPI
-
-  class Client
-    attr_reader :config
-    attr_accessor :logger
-    attr_reader :token
-
-    API_VERSION = 'api/v2'
-    CLOUD_ENDPOINT = 'https://cloud.bitbar.com'
-
-    def initialize(username, password, cloud_url = CLOUD_ENDPOINT, logger = nil)
-      # Instance variables
-      @username = username
-      @password = password
-      @cloud_url = cloud_url
-      @logger = logger
-
-      if @logger.nil?
-        @logger = Logger.new(STDOUT)
-        @logger.info("Logger is not defined => output to STDOUT")
-      end
-    end
-
-    def authorize
-      @client = OAuth2::Client.new(
-          'testdroid-cloud-api', nil, :site => @cloud_url, :token_url => 'oauth/token') do |faraday|
-        faraday.request :multipart
-        faraday.request :url_encoded
-        faraday.response :logger, @logger
-        faraday.adapter Faraday.default_adapter
-      end
-
-      @token = @client.password.get_token(@username, @password)
-
-      if @cloud_user.nil?
-        @cloud_user = TestdroidAPI::User.new("/#{API_VERSION}/me", self).refresh
-        @cloud_user = TestdroidAPI::User.new("/#{API_VERSION}/users/#{@cloud_user.id}", self).refresh
-
-      end
-      @cloud_user
-    end
-
-    def mime_for(path)
-      mime = MIME::Types.type_for path
-      mime.empty? ? 'text/plain' : mime[0].content_type
-    end
-
-    def upload(uri, filename)
-      begin
-        @token = @token.refresh! if @token.expired?
-        connection = @token.client.connection
-        payload = {:file => Faraday::UploadIO.new(filename, mime_for(filename))}
-        response = connection.post(@cloud_url + "#{uri}", payload, @token.headers)
-      rescue => e
-        @logger.error e
-        return nil
-      end
-      JSON.parse(response.body)
-    end
-
-    def post(uri, params = {})
-
-      @token = @token.refresh! if @token.expired?
-
-      begin
-        resp = @token.post("#{@cloud_url}#{uri}", params)
-      rescue => e
-        @logger.error "Failed to post resource #{uri} #{e}"
-        return nil
-      end
-
-      if resp.body.nil? || resp.body.length == 0
-        return nil
-      end
-
-      JSON.parse(resp.body)
-    end
-
-    def get(uri, params = {})
-
-      @token = @token.refresh! if @token.expired?
-
-      begin
-        resp = @token.get(@cloud_url + "#{uri}", :params => params)
-      rescue => e
-        @logger.error "Failed to get resource #{uri} #{e}"
-        return nil
-      end
-      JSON.parse(resp.body)
-    end
-
-    def delete(uri)
-
-      @token = @token.refresh! if @token.expired?
-
-      begin
-        resp = @token.delete(@cloud_url + "#{uri}")
-      rescue => e
-        @logger.error "Failed to delete resource #{uri} #{e}"
-        return nil
-      end
-
-      if resp.status != 204
-        @logger.error "Failed to delete resource #{uri} #{e}"
-      else
-        @logger.info "response: #{resp.status}"
-      end
-    end
-
-    def download(uri, file_name)
-      begin
-        @token = @token.refresh! if @token.expired?
-        ::File.open(file_name, "w+b") do |file|
-          full_uri = uri.start_with?(@cloud_url) ? uri : @cloud_url + uri
-          resp = @token.get(full_uri)
-          file.write(resp.body)
-        end
-      rescue => e
-        @logger.error "Failed to get resource #{uri} #{e}"
-        return nil
-      end
-    end
-
-# Resources
-
-# public read-only
-
-    def info
-      TestdroidAPI::CloudResource.new("/#{API_VERSION}/info", self, "info")
-    end
-
-    def devices
-      TestdroidAPI::Devices.new("/#{API_VERSION}/devices", self)
-    end
-
-    def label_groups
-      TestdroidAPI::LabelGroups.new("/#{API_VERSION}/label-groups", self)
-    end
-
-# user read-write
-
-    def me
-      TestdroidAPI::User.new("/#{API_VERSION}/me", self).load
-    end
-
-    def properties
-      TestdroidAPI::Properties.new("/#{API_VERSION}/properties", self)
-    end
-
-    def device_session_connections
-      TestdroidAPI::DeviceSessionConnections.new("/#{API_VERSION}/device-session-connections", self)
-    end
-
-# admin only
-
-    def admin
-      TestdroidAPI::Admin.new("/#{API_VERSION}/admin", self)
-    end
-
-  end
-end