Skip to content
This repository was archived by the owner on Mar 16, 2019. It is now read-only.

Commit 3793e49

Browse files
committed
remove unnecessary code
1 parent 7a9f139 commit 3793e49

File tree

5 files changed

+22
-43
lines changed

5 files changed

+22
-43
lines changed

src/android/src/main/java/com/RNFetchBlob/RNFetchBlobBody.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -370,6 +370,8 @@ public FormField(ReadableMap rawData) {
370370
* @param written
371371
*/
372372
private void emitUploadProgress(int written) {
373+
if(!RNFetchBlobReq.isReportProgress(mTaskId))
374+
return;
373375
WritableMap args = Arguments.createMap();
374376
args.putString("taskId", mTaskId);
375377
args.putString("written", String.valueOf(written));

src/ios/RNFetchBlobNetwork.m

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -353,11 +353,6 @@ - (void) URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didCom
353353
{
354354
errMsg = [error localizedDescription];
355355
}
356-
// Fix #72 response with status code 200 ~ 299 considered as success
357-
else if(respStatus> 299 || respStatus < 200)
358-
{
359-
errMsg = [NSString stringWithFormat:@"Request failed, status %d", respStatus];
360-
}
361356
else
362357
{
363358
if(respFile == YES)

test/test-0.9.5.js

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -30,25 +30,6 @@ let prefix = ((Platform.OS === 'android') ? 'file://' : '')
3030

3131
describe('issue #122 force response data format', (report, done) => {
3232

33-
RNFetchBlob.fetch('GET', `${TEST_SERVER_URL}/public/json-dummy.json`, {
34-
'RNFB-Response' : 'base64'
35-
})
36-
.then((res) => {
37-
let r = RNFetchBlob.base64.decode(res.data)
38-
report(
39-
<Assert key="test data verify" expect="fetchblob-dev" actual={JSON.parse(r).name}/>,
40-
<Assert key="should successfully decode the data" expect={true} actual={true}/>)
41-
return RNFetchBlob.fetch('GET', `${TEST_SERVER_URL}/public/json-dummy.json`)
42-
})
43-
.then((res) => {
44-
report(
45-
<Assert key="response should in format of plain-text" expect="fetchblob-dev" actual={JSON.parse(res.data).name}/>)
46-
done()
47-
})
48-
.catch(() => {
49-
report(
50-
<Assert key="Should successfully decode the data" expect={true} actual={false}/>)
51-
done()
5233
})
5334

5435
})

test/test-init.js

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ const { Assert, Comparer, Info, prop } = RNTest
1818
// test environment variables
1919

2020
prop('FILENAME', `${Platform.OS}-0.8.0-${Date.now()}.png`)
21-
prop('TEST_SERVER_URL', 'http://192.168.16.70:8123')
22-
prop('TEST_SERVER_URL_SSL', 'https://192.168.16.70:8124')
21+
prop('TEST_SERVER_URL', 'http://192.168.0.14:8123')
22+
prop('TEST_SERVER_URL_SSL', 'https://192.168.0.14:8124')
2323
prop('DROPBOX_TOKEN', 'fsXcpmKPrHgAAAAAAAAAoXZhcXYWdgLpQMan6Tb_bzJ237DXhgQSev12hA-gUXt4')
2424
prop('styles', {
2525
image : {
@@ -59,21 +59,22 @@ describe('GET image from server', (report, done) => {
5959
})
6060

6161

62-
require('./test-0.1.x-0.4.x')
63-
require('./test-0.5.1')
64-
require('./test-0.5.2')
65-
require('./test-0.6.0')
66-
require('./test-0.6.2')
67-
require('./test-0.7.0')
68-
require('./test-0.8.0')
69-
require('./test-0.9.0')
70-
require('./test-0.9.2')
71-
require('./test-0.9.4')
72-
require('./test-fetch')
73-
require('./test-fs')
74-
require('./test-xmlhttp')
75-
require('./test-blob')
76-
require('./test-firebase')
77-
require('./test-android')
62+
// require('./test-0.1.x-0.4.x')
63+
// require('./test-0.5.1')
64+
// require('./test-0.5.2')
65+
// require('./test-0.6.0')
66+
// require('./test-0.6.2')
67+
// require('./test-0.7.0')
68+
// require('./test-0.8.0')
69+
// require('./test-0.9.0')
70+
// require('./test-0.9.2')
71+
// require('./test-0.9.4')
72+
require('./test-0.9.5')
73+
// require('./test-fetch')
74+
// require('./test-fs')
75+
// require('./test-xmlhttp')
76+
// require('./test-blob')
77+
// require('./test-firebase')
78+
// require('./test-android')
7879
// require('./test-stress')
7980
// require('./benchmark')

test/test-xmlhttp.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ describe('HTTP error should not throw error event', (report, done) => {
136136
xhr.onerror = function() {
137137
report(
138138
<Assert
139-
key={`HTTP error ${code} should not throw error event`}
139+
key={`HTTP status ${code} should not throw error event`}
140140
expect={false}
141141
actual={true}/>)
142142
}

0 commit comments

Comments
 (0)