mirror of
				https://github.com/zulip/zulip.git
				synced 2025-11-03 21:43:21 +00:00 
			
		
		
		
	Add type annotations. Create custom types for Bot and Service.
Add zod data validation for incoming bot data from server.
Based on `zerver/openapi/zulip.yaml` description, `add` operation
(`op`) carries data that follows `Bot` structure. So taking
reference from `bot` structure, I create `ServerAddBotData` zod
schema and infer its type. Similarly, `update` operation carries
data that follows `BasicBot`, so I create `ServerUpdateBotData`.
Note that `Bot` inherits from `BasicBot`.
`zerver/openapi/zulip.yaml` describes that `services` in `BasicBot`
can be one of two objects, one with `{base_url, token, interface}`,
another with `{service_name, config_data}`. Therefore, I create
two corresponding schema and infer their types.
Fix two test cases `bot_data.test.js` and `settings_bots.test.js`
whose synthetic objects should have had followed the schema.
		
	
		
			
				
	
	
		
			155 lines
		
	
	
		
			4.2 KiB
		
	
	
	
		
			JavaScript
		
	
	
	
	
	
			
		
		
	
	
			155 lines
		
	
	
		
			4.2 KiB
		
	
	
	
		
			JavaScript
		
	
	
	
	
	
"use strict";
 | 
						|
 | 
						|
const {strict: assert} = require("assert");
 | 
						|
 | 
						|
const {mock_cjs, zrequire} = require("./lib/namespace");
 | 
						|
const {run_test} = require("./lib/test");
 | 
						|
const $ = require("./lib/zjquery");
 | 
						|
const {page_params} = require("./lib/zpage_params");
 | 
						|
 | 
						|
const bot_data_params = {
 | 
						|
    realm_bots: [
 | 
						|
        {
 | 
						|
            api_key: "QadL788EkiottHmukyhHgePUFHREiu8b",
 | 
						|
            avatar_url: "",
 | 
						|
            bot_type: 1, // DEFAULT_BOT
 | 
						|
            default_all_public_streams: true,
 | 
						|
            default_events_register_stream: "register stream 1",
 | 
						|
            default_sending_stream: "sending stream 1",
 | 
						|
            email: "error-bot@zulip.org",
 | 
						|
            full_name: "Error bot",
 | 
						|
            is_active: true,
 | 
						|
            owner: "someone 4",
 | 
						|
            owner_id: 4,
 | 
						|
            user_id: 1,
 | 
						|
            services: [],
 | 
						|
            extra: "This field should be ignored",
 | 
						|
        },
 | 
						|
    ],
 | 
						|
};
 | 
						|
 | 
						|
class ClipboardJS {
 | 
						|
    constructor(sel) {
 | 
						|
        assert.equal(sel, "#copy_zuliprc");
 | 
						|
    }
 | 
						|
    on() {
 | 
						|
        // do nothing.
 | 
						|
    }
 | 
						|
}
 | 
						|
mock_cjs("clipboard", ClipboardJS);
 | 
						|
 | 
						|
const bot_data = zrequire("bot_data");
 | 
						|
const settings_bots = zrequire("settings_bots");
 | 
						|
 | 
						|
bot_data.initialize(bot_data_params);
 | 
						|
 | 
						|
function test(label, f) {
 | 
						|
    run_test(label, ({override}) => {
 | 
						|
        page_params.realm_uri = "https://chat.example.com";
 | 
						|
        page_params.realm_embedded_bots = [
 | 
						|
            {name: "converter", config: {}},
 | 
						|
            {name: "giphy", config: {key: "12345678"}},
 | 
						|
            {name: "foobot", config: {bar: "baz", qux: "quux"}},
 | 
						|
        ];
 | 
						|
 | 
						|
        f({override});
 | 
						|
    });
 | 
						|
}
 | 
						|
 | 
						|
test("generate_zuliprc_url", () => {
 | 
						|
    const url = settings_bots.generate_zuliprc_url(1);
 | 
						|
    const expected =
 | 
						|
        "data:application/octet-stream;charset=utf-8," +
 | 
						|
        encodeURIComponent(
 | 
						|
            "[api]\nemail=error-bot@zulip.org\n" +
 | 
						|
                "key=QadL788EkiottHmukyhHgePUFHREiu8b\n" +
 | 
						|
                "site=https://chat.example.com\n",
 | 
						|
        );
 | 
						|
 | 
						|
    assert.equal(url, expected);
 | 
						|
});
 | 
						|
 | 
						|
test("generate_zuliprc_content", () => {
 | 
						|
    const bot_user = bot_data.get(1);
 | 
						|
    const content = settings_bots.generate_zuliprc_content(bot_user);
 | 
						|
    const expected =
 | 
						|
        "[api]\nemail=error-bot@zulip.org\n" +
 | 
						|
        "key=QadL788EkiottHmukyhHgePUFHREiu8b\n" +
 | 
						|
        "site=https://chat.example.com\n";
 | 
						|
 | 
						|
    assert.equal(content, expected);
 | 
						|
});
 | 
						|
 | 
						|
test("generate_botserverrc_content", () => {
 | 
						|
    const user = {
 | 
						|
        email: "vabstest-bot@zulip.com",
 | 
						|
        api_key: "nSlA0mUm7G42LP85lMv7syqFTzDE2q34",
 | 
						|
    };
 | 
						|
    const service = {
 | 
						|
        token: "abcd1234",
 | 
						|
    };
 | 
						|
    const content = settings_bots.generate_botserverrc_content(
 | 
						|
        user.email,
 | 
						|
        user.api_key,
 | 
						|
        service.token,
 | 
						|
    );
 | 
						|
    const expected =
 | 
						|
        "[]\nemail=vabstest-bot@zulip.com\n" +
 | 
						|
        "key=nSlA0mUm7G42LP85lMv7syqFTzDE2q34\n" +
 | 
						|
        "site=https://chat.example.com\n" +
 | 
						|
        "token=abcd1234\n";
 | 
						|
 | 
						|
    assert.equal(content, expected);
 | 
						|
});
 | 
						|
 | 
						|
test("test tab clicks", () => {
 | 
						|
    settings_bots.set_up();
 | 
						|
 | 
						|
    function click_on_tab($tab_elem) {
 | 
						|
        $tab_elem.trigger("click");
 | 
						|
    }
 | 
						|
 | 
						|
    const tabs = {
 | 
						|
        $active: $("#bots_lists_navbar .active-bots-tab"),
 | 
						|
        $inactive: $("#bots_lists_navbar .inactive-bots-tab"),
 | 
						|
    };
 | 
						|
 | 
						|
    $("#bots_lists_navbar .active").removeClass = (cls) => {
 | 
						|
        assert.equal(cls, "active");
 | 
						|
        for (const $tab of Object.values(tabs)) {
 | 
						|
            $tab.removeClass("active");
 | 
						|
        }
 | 
						|
    };
 | 
						|
 | 
						|
    const forms = {
 | 
						|
        $active: $("#active_bots_list"),
 | 
						|
        $inactive: $("#inactive_bots_list"),
 | 
						|
    };
 | 
						|
 | 
						|
    click_on_tab(tabs.$active);
 | 
						|
    assert.ok(tabs.$active.hasClass("active"));
 | 
						|
    assert.ok(!tabs.$inactive.hasClass("active"));
 | 
						|
 | 
						|
    assert.ok(forms.$active.visible());
 | 
						|
    assert.ok(!forms.$inactive.visible());
 | 
						|
 | 
						|
    click_on_tab(tabs.$inactive);
 | 
						|
    assert.ok(!tabs.$active.hasClass("active"));
 | 
						|
    assert.ok(tabs.$inactive.hasClass("active"));
 | 
						|
 | 
						|
    assert.ok(!forms.$active.visible());
 | 
						|
    assert.ok(forms.$inactive.visible());
 | 
						|
});
 | 
						|
 | 
						|
test("can_create_new_bots", () => {
 | 
						|
    page_params.is_admin = true;
 | 
						|
    assert.ok(settings_bots.can_create_new_bots());
 | 
						|
 | 
						|
    page_params.is_admin = false;
 | 
						|
    page_params.realm_bot_creation_policy = 1;
 | 
						|
    assert.ok(settings_bots.can_create_new_bots());
 | 
						|
 | 
						|
    page_params.realm_bot_creation_policy = 3;
 | 
						|
    assert.ok(!settings_bots.can_create_new_bots());
 | 
						|
});
 |