Skip to content

Commit 1ba23f0

Browse files
Merge branch 'main' into honnor-passing-bolt-logger-in-default-web-client-installation
2 parents 4e880dc + 4c237fe commit 1ba23f0

File tree

3 files changed

+23
-9
lines changed

3 files changed

+23
-9
lines changed

.github/maintainers_guide.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,11 +103,11 @@ If you want to test the package locally you can.
103103
- This will create a `.whl` file in the `./dist` folder
104104
2. Use the built package
105105
- Example `/dist/slack_bolt-1.2.3-py2.py3-none-any.whl` was created
106-
- From anywhere on your machine you can install this package to a project with
106+
- From anywhere on your machine you can install this package to a project with
107107
```bash
108108
pip install <project path>/dist/slack_bolt-1.2.3-py2.py3-none-any.whl
109109
```
110-
- It is also possible to include `<project path>/dist/slack_bolt-1.2.3-py2.py3-none-any.whl` in a [requirements.txt](https://pip.pypa.io/en/stable/user_guide/#requirements-files) file
110+
- It is also possible to include `slack_bolt @ file:///<project path>/dist/slack_bolt-1.2.3-py2.py3-none-any.whl` in a [requirements.txt](https://pip.pypa.io/en/stable/user_guide/#requirements-files) file
111111

112112
### Releasing
113113

tests/scenario_tests/test_web_client_customization.py

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,10 @@ class TestWebClientCustomization:
2323
mock_api_server_base_url = "http://localhost:8888"
2424
signature_verifier = SignatureVerifier(signing_secret)
2525
test_logger = logging.getLogger("test.logger")
26-
web_client = WebClient(token=valid_token, base_url=mock_api_server_base_url)
26+
web_client = WebClient(
27+
token=valid_token,
28+
base_url=mock_api_server_base_url,
29+
)
2730

2831
def setup_method(self):
2932
self.old_os_env = remove_os_env_temporarily()
@@ -68,11 +71,19 @@ def listener(ack, client):
6871
assert response.body == ""
6972
assert_auth_test_count(self, 1)
7073

71-
def test_default_app_web_client_logger_is_app_logger(self):
74+
def test_web_client_logger_is_default_app_logger(self):
7275
app = App(token=self.valid_token, signing_secret=self.signing_secret, token_verification_enabled=False)
73-
app.client.base_url = self.mock_api_server_base_url
76+
assert app.client._logger == app.logger # TODO: use client.logger when available
7477

75-
assert app.client.logger == app.logger
78+
def test_web_client_logger_is_app_logger(self):
79+
app = App(
80+
token=self.valid_token,
81+
signing_secret=self.signing_secret,
82+
logger=self.test_logger,
83+
token_verification_enabled=False,
84+
)
85+
assert app.client._logger == app.logger # TODO: use client.logger when available
86+
assert app.client._logger == self.test_logger # TODO: use client.logger when available
7687

7788
def test_default_web_client_uses_bolt_framework_logger(self):
7889
app = App(token=self.valid_token, signing_secret=self.signing_secret, token_verification_enabled=False)

tests/scenario_tests_async/test_web_client_customization.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,14 @@ async def listener(ack, client):
8989
assert response.body == ""
9090
await assert_auth_test_count_async(self, 1)
9191

92-
def test_default_app_web_client_logger_is_app_logger(self):
92+
def test_web_client_logger_is_default_app_logger(self):
9393
app = AsyncApp(token=self.valid_token, signing_secret=self.signing_secret)
94-
app.client.base_url = self.mock_api_server_base_url
94+
assert app.client._logger == app.logger # TODO: use client.logger when available
9595

96-
assert app.client.logger == app.logger
96+
def test_web_client_logger_is_app_logger(self):
97+
app = AsyncApp(token=self.valid_token, signing_secret=self.signing_secret, logger=self.test_logger)
98+
assert app.client._logger == app.logger # TODO: use client.logger when available
99+
assert app.client._logger == self.test_logger # TODO: use client.logger when available
97100

98101
@pytest.mark.asyncio
99102
async def test_default_web_client_uses_bolt_framework_logger(self):

0 commit comments

Comments
 (0)