Skip to content

Commit b988b64

Browse files
committed
LNX-329 - Change None to empty space inject rum script
1 parent 9a0b65b commit b988b64

File tree

3 files changed

+15
-9
lines changed

3 files changed

+15
-9
lines changed

stackify/rum.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,30 +13,30 @@
1313

1414
def insert_rum_script():
1515
apm_rum_script = insert_rum_script_apm()
16-
if apm_rum_script:
16+
if apm_rum_script is not None:
1717
return apm_rum_script
1818

1919
rum_key = config.rum_key
2020
rum_script_url = config.rum_script_url
2121

2222
if not rum_script_url or not rum_key:
23-
return None
23+
return ''
2424

2525
transaction_id = get_transaction_id()
2626
if not transaction_id:
27-
return None
27+
return ''
2828

2929
reporting_url = get_reporting_url()
3030
if not reporting_url:
31-
return None
31+
return ''
3232

3333
application_name = config.application
3434
if not application_name:
35-
return None
35+
return ''
3636

3737
environment = config.environment
3838
if not environment:
39-
return None
39+
return ''
4040

4141
settings = {
4242
"ID": transaction_id
@@ -58,7 +58,7 @@ def insert_rum_script():
5858
settings["Trans"] = reporting_url_b64
5959

6060
if not settings:
61-
return None
61+
return ''
6262

6363
return '<script type="text/javascript">(window.StackifySettings || (window.StackifySettings = {}))</script><script src="{}" data-key="{}" async></script>'.format(
6464
json.dumps(settings),
@@ -77,7 +77,7 @@ def get_reporting_url():
7777

7878
def insert_rum_script_apm():
7979
if not is_apm_installed():
80-
return
80+
return None
8181

8282
return insert_rum_script_from_apm()
8383

tests/rum/test_rum_apm.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,3 +74,4 @@ def test_default_insert_rum_script_from_apm_without_transaction(self):
7474

7575
rum_data = stackify.rum.insert_rum_script()
7676
assert not rum_data
77+
assert rum_data is ''

tests/test_rum.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,8 @@ def test_default_insert_rum_script_no_transaction_id(self, func_apm):
7575
result = stackify.rum.insert_rum_script()
7676
self.reset_common_config()
7777

78-
assert result is None
78+
assert not result
79+
assert result is ''
7980

8081
@mock.patch('stackify.rum.is_apm_installed')
8182
def test_default_insert_rum_script_no_key(self, func_apm):
@@ -88,6 +89,7 @@ def test_default_insert_rum_script_no_key(self, func_apm):
8889

8990
result = stackify.rum.insert_rum_script()
9091
assert not result
92+
assert result is ''
9193

9294
self.reset_common_config()
9395

@@ -98,6 +100,7 @@ def test_default_insert_rum_script_no_details(self, func_apm):
98100

99101
result = stackify.rum.insert_rum_script()
100102
assert not result
103+
assert result is ''
101104

102105
self.reset_common_config()
103106

@@ -136,6 +139,7 @@ def test_default_insert_rum_script_no_key_from_api(self, func_apm):
136139
self.reset_common_config()
137140

138141
assert not result
142+
assert result is ''
139143

140144
@mock.patch('stackify.rum.is_apm_installed')
141145
def test_default_insert_rum_script_no_details_from_api(self, func_apm):
@@ -150,6 +154,7 @@ def test_default_insert_rum_script_no_details_from_api(self, func_apm):
150154
self.reset_common_config()
151155

152156
assert not result
157+
assert result is ''
153158

154159
def update_common_config(self, rum_key=None, rum_script_url=None, application=None, environment=None):
155160
self.config_rum_key = stackify.config.rum_key

0 commit comments

Comments
 (0)