Skip to content

Commit bc876f6

Browse files
bishosilwalbishosilwal
committed
fix issues with the failed tests
1 parent 7f4c3ef commit bc876f6

File tree

10 files changed

+416
-385
lines changed

10 files changed

+416
-385
lines changed

‎lib/carrierwave/carrierwave.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ def filename
3636
end
3737

3838
if self.file != nil
39-
resp = @imagekit.upload_file(file: open(self.file.file, 'rb'), file_name: self.file.filename, options: @options)
39+
resp = @imagekit.upload_file(file: open(self.file.file, 'rb'), file_name: self.file.filename, **@options)
4040
# ::File.delete(self.file.file)
4141
res = resp[:response].to_json
4242
if res != "null"

‎lib/imagekitio/api_service/custom_metadata_field.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
module ImageKitIo
55
module ApiService
6-
class CustomMetaDataField
6+
class CustomMetadataField
77
include Utils::OptionValidator
88
include Constantable
99

‎lib/imagekitio/client.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ def initialize(private_key, public_key, url_endpoint, transformation_pos = nil,
4040
@ik_req = Request.new(private_key, public_key, url_endpoint)
4141
@url_obj = Url.new(@ik_req)
4242
@file_service = ApiService::File.new(@ik_req)
43-
@custom_metadata_field_service = ApiService::CustomMetaDataField.new(@ik_req)
43+
@custom_metadata_field_service = ApiService::CustomMetadataField.new(@ik_req)
4444
@folder_service = ApiService::Folder.new(@ik_req)
4545
@bulk_service = ApiService::Bulk.new(@ik_req)
4646
end
@@ -55,7 +55,7 @@ def url(options = {})
5555
@url_obj.generate_url(options)
5656
end
5757

58-
def upload_file(file: nil, file_name: nil, options: {})
58+
def upload_file(file: nil, file_name: nil, **options)
5959
# upload file to imagekit server
6060
@file_service.upload(file: file, file_name: file_name, **options)
6161
end

‎lib/imagekitio/utils/option_validator.rb‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ module ImageKitIo
44
module Utils
55
module OptionValidator
66
include Formatter
7+
include Constantable
78

89
module_function
910

‎test/imagekit/api_service/bulk_test.rb‎

Lines changed: 161 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,161 @@
1+
require_relative '../spec_helper'
2+
3+
RSpec.describe ImageKitIo::ApiService::Bulk do
4+
let(:bulk_api_service) { described_class }
5+
let(:config) { ImageKitIo.config }
6+
let(:constants) { ImageKitIo.constants }
7+
let!(:private_key) { config.private_key }
8+
let!(:public_key) { config.public_key }
9+
let!(:url_endpoint) { config.url_endpoint }
10+
11+
describe 'TestBatchDelete' do
12+
it "test_remove_files_fails_on_unauthenticated_request" do
13+
file_ids = %w[file_id_1 file_id_2]
14+
request_obj = double
15+
allow(ImageKitIo::Request)
16+
.to receive(:new)
17+
.with(private_key, public_key, url_endpoint)
18+
.and_return(request_obj)
19+
20+
allow(request_obj)
21+
.to receive(:create_headers)
22+
.and_return({})
23+
24+
allow(request_obj)
25+
.to receive(:request){|method,url,headers,payload| @ac={method: method, url: url, headers: headers, payload:payload}}
26+
.and_return({code: 401, body: {}})
27+
28+
SUT = bulk_api_service.new(request_obj)
29+
resp = SUT.remove_files(file_ids: file_ids)
30+
31+
expect(@ac[:payload]).to eq({"fileIds": file_ids}.to_json)
32+
expect(resp[:code]).to eq(401)
33+
end
34+
35+
it "test_remove_files_fails_on_item_not_found" do
36+
file_ids = %w[file_id_1 file_id_2]
37+
request_obj = double
38+
allow(ImageKitIo::Request)
39+
.to receive(:new)
40+
.with(private_key, public_key, url_endpoint)
41+
.and_return(request_obj)
42+
43+
allow(request_obj)
44+
.to receive(:create_headers)
45+
.and_return({})
46+
47+
allow(request_obj)
48+
.to receive(:request){|method,url,headers,payload| @ac={method: method, url: url, headers: headers, payload:payload}}
49+
.and_return({code: 404, body: {message: "The requested file(s) does not exist.",
50+
help: "For support kindly contact us at [email protected] .",
51+
missingFileIds: file_ids,},},)
52+
53+
SUT = bulk_api_service.new(request_obj)
54+
resp = SUT.remove_files(file_ids: file_ids)
55+
56+
expect(@ac[:payload]).to eq({"fileIds": file_ids}.to_json)
57+
expect(resp[:code]).to eq(404)
58+
expect(resp[:body][:missingFileIds]).to eq(file_ids)
59+
end
60+
61+
it "test_remove_files_succeeds" do
62+
request_obj = double
63+
file_ids = %w[file_id_1 file_id_2]
64+
65+
allow(ImageKitIo::Request)
66+
.to receive(:new)
67+
.with(private_key, public_key, url_endpoint)
68+
.and_return(request_obj)
69+
70+
allow(request_obj)
71+
.to receive(:create_headers)
72+
.and_return({})
73+
74+
allow(request_obj)
75+
.to receive(:request){|method,url,headers,payload| @ac={method: method, url: url, headers: headers, payload:payload}}
76+
.and_return({code: 200, body: {successfullyDeletedFileIds: file_ids}})
77+
78+
SUT = bulk_api_service.new(request_obj)
79+
resp = SUT.remove_files(file_ids: file_ids)
80+
81+
expect(@ac[:payload]).to eq({"fileIds": file_ids}.to_json)
82+
expect(resp[:code]).to eq(200)
83+
expect(resp[:body][:successfullyDeletedFileIds]).to eq(file_ids)
84+
end
85+
end
86+
87+
context 'batch tags' do
88+
let!(:req_obj) { double }
89+
let(:file_ids) { %[file_id_1 file_id_2] }
90+
91+
before do
92+
allow(ImageKitIo::Request)
93+
.to receive(:new)
94+
.with(private_key, public_key, url_endpoint)
95+
.and_return(req_obj)
96+
allow(req_obj)
97+
.to receive(:create_headers)
98+
.and_return({})
99+
allow(req_obj)
100+
.to receive(:request){|method,url,headers,payload| @ac={method: method, url: url, headers: headers, payload: payload}}
101+
.and_return({code: 200, body: { successfullyUpdatedFileIds: file_ids }})
102+
@sut = bulk_api_service.new(req_obj)
103+
end
104+
105+
it 'test_add_tags' do
106+
resp = @sut.add_tags(file_ids: file_ids, tags: ['custom_tag'])
107+
expect(@ac[:url]).to eq("https://api.imagekit.io/v1/files/addTags")
108+
expect(@ac[:payload]).to eq("{\"fileIds\":\"file_id_1 file_id_2\",\"tags\":[\"custom_tag\"]}")
109+
expect(resp[:code]).to eq(200)
110+
end
111+
112+
it 'test_remove_tags' do
113+
resp = @sut.remove_tags(file_ids: file_ids, tags: ['custom_tag_remove'])
114+
expect(@ac[:url]).to eq("https://api.imagekit.io/v1/files/removeTags")
115+
expect(@ac[:payload]).to eq("{\"fileIds\":\"file_id_1 file_id_2\",\"tags\":[\"custom_tag_remove\"]}")
116+
expect(resp[:code]).to eq(200)
117+
end
118+
119+
it 'test_remove_ai_tags' do
120+
resp = @sut.remove_ai_tags(file_ids: file_ids, ai_tags: ['custom_ai_tag'])
121+
expect(@ac[:url]).to eq("https://api.imagekit.io/v1/files/removeAITags")
122+
expect(@ac[:payload]).to eq("{\"fileIds\":\"file_id_1 file_id_2\",\"AITags\":[\"custom_ai_tag\"]}")
123+
expect(resp[:code]).to eq(200)
124+
end
125+
end
126+
127+
context 'job status' do
128+
let(:req_obj) { double }
129+
let(:job_id) { '619e038e20b7ef03efc4eeb9' }
130+
131+
before do
132+
allow(ImageKitIo::Request)
133+
.to receive(:new)
134+
.with(private_key, public_key, url_endpoint)
135+
.and_return(req_obj)
136+
allow(req_obj)
137+
.to receive(:create_headers)
138+
.and_return({})
139+
response_body = {"jobId"=> job_id, "type"=>"MOVE_FOLDER", "status"=>"Completed"}
140+
allow(req_obj)
141+
.to receive(:request){|method,url,headers,payload| @ac={method: method, url: url, headers: headers, payload: payload}}
142+
.and_return({code: 200, body: response_body })
143+
@sut = bulk_api_service.new(req_obj)
144+
end
145+
146+
it 'raises error when parameter id not given' do
147+
expect {
148+
@sut.job_status
149+
}.to raise_error(ArgumentError)
150+
end
151+
152+
it 'test_job_status' do
153+
resp = @sut.job_status(job_id: job_id)
154+
expect(@ac[:url]).to eq("https://api.imagekit.io/v1/bulkJobs/#{job_id}")
155+
expect(@ac[:method]).to eq('get')
156+
expect(@ac[:payload]).to eq({ :jobId => job_id})
157+
expect(resp[:body]['jobId']).to eq(job_id)
158+
expect(resp[:body]['status']).to eq('Completed')
159+
end
160+
end
161+
end

‎test/imagekit/api_service/custom_metadata_field_test.rb‎

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
require_relative '../spec_helper'
2+
3+
RSpec.describe ImageKitIo::ApiService::CustomMetadataField do
4+
let(:custom_metadata_service) { described_class }
5+
let(:config) { ImageKitIo.config }
6+
let(:constants) { ImageKitIo.constants }
7+
let!(:private_key) { config.private_key }
8+
let!(:public_key) { config.public_key }
9+
let!(:url_endpoint) { config.url_endpoint }
10+
11+
context 'custom metadata' do
12+
let(:req_obj) { double }
13+
let(:success_response) {
14+
{"id"=>"619e667520b7ef03efc5d870", "name"=>"price1", "label"=>"price", "schema"=>{"type"=>"Number", "minValue"=>100, "maxValue"=>300}}
15+
}
16+
before do
17+
allow(ImageKitIo::Request)
18+
.to receive(:new)
19+
.with(private_key, public_key, url_endpoint)
20+
.and_return(req_obj)
21+
allow(req_obj)
22+
.to receive(:create_headers)
23+
.and_return({})
24+
25+
end
26+
27+
it 'raises error when not providing parameter for create' do
28+
@sut = custom_metadata_service.new(req_obj)
29+
expect {
30+
@sut.create(name: nil, label: 'test_label', schema: '')
31+
}.to raise_error(ArgumentError)
32+
end
33+
34+
it 'test_create_custom_metadata' do
35+
allow(req_obj)
36+
.to receive(:request){|method,url,headers,payload| @ac={method: method, url: url, headers: headers, payload: payload}}
37+
.and_return({code: 200, body: success_response })
38+
@sut = custom_metadata_service.new(req_obj)
39+
resp = @sut.create(
40+
name: 'price1',
41+
label: 'price',
42+
schema: {
43+
type: 'Number',
44+
minValue: 100,
45+
maxValue: 300
46+
}
47+
)
48+
expect(@ac[:url]).to eq("https://api.imagekit.io/v1/customMetadataFields")
49+
expect(@ac[:method]).to eq('post')
50+
expect(resp[:body]['id']).to eq(success_response["id"])
51+
end
52+
53+
it 'test_get_custom_metadata' do
54+
allow(req_obj)
55+
.to receive(:request){|method,url,headers,payload| @ac={method: method, url: url, headers: headers, payload: payload}}
56+
.and_return({code: 200, body: [success_response] })
57+
@sut = custom_metadata_service.new(req_obj)
58+
resp = @sut.list
59+
expect(@ac[:url]).to eq("https://api.imagekit.io/v1/customMetadataFields")
60+
expect(@ac[:method]).to eq('get')
61+
expect(resp[:body]).to eq([success_response])
62+
end
63+
64+
it 'test_update_custom_metadata' do
65+
metadata_id = "619e667320b7ef03efc5d850"
66+
allow(req_obj)
67+
.to receive(:request){|method,url,headers,payload| @ac={method: method, url: url, headers: headers, payload: payload}}
68+
.and_return({code: 200, body: {"id"=>metadata_id, "name"=>"price1", "label"=>"price1", "schema"=>{"type"=>"Number", "minValue"=>100, "maxValue"=>300}} })
69+
@sut = custom_metadata_service.new(req_obj)
70+
resp = @sut.update(id: metadata_id, label: 'price1', schema: nil)
71+
expect(@ac[:url]).to eq("https://api.imagekit.io/v1/customMetadataFields/#{metadata_id}")
72+
expect(@ac[:method]).to eq('patch')
73+
expect(resp[:body]).to eq({"id"=>metadata_id, "name"=>"price1", "label"=>"price1", "schema"=>{"type"=>"Number", "minValue"=>100, "maxValue"=>300}} )
74+
end
75+
76+
it 'test_delete_custom_metadata' do
77+
metadata_id = "619e667320b7ef03efc5d850"
78+
allow(req_obj)
79+
.to receive(:request){|method,url,headers,payload| @ac={method: method, url: url, headers: headers, payload: payload}}
80+
.and_return({code: 204, body: { success: true} })
81+
@sut = custom_metadata_service.new(req_obj)
82+
@sut.delete(id: metadata_id)
83+
expect(@ac[:url]).to eq("https://api.imagekit.io/v1/customMetadataFields/#{metadata_id}")
84+
expect(@ac[:method]).to eq('delete')
85+
end
86+
end
87+
end

0 commit comments

Comments
 (0)