Fakultas Ilmu Komputer UI

Commit 9c3ade78 authored by fadintan's avatar fadintan
Browse files

[CHORES] solve merge conflict

parent 1ab8e22c
Pipeline #70233 passed with stages
in 3 minutes and 24 seconds
...@@ -505,5 +505,5 @@ test("Test tambah produk required marks", async () => { ...@@ -505,5 +505,5 @@ test("Test tambah produk required marks", async () => {
await fireEvent.submit(getByTestId("submit-produk")); await fireEvent.submit(getByTestId("submit-produk"));
}); });
const formProduk = getByTestId("tambah-produk"); const formProduk = getByTestId("tambah-produk");
expect(formProduk.textContent).toContain("* Perlu diisi", "Nama Produk*", "Kategori*", "Subkategori*", "Deskripsi Produk*", "Modal/satuan*", "Harga/satuan*"); expect(formProduk.textContent).toContain("* Perlu diisi", "Nama Produk*", "Kategori*", "Subkategori*", "Deskripsi Produk*", "Modal/satuan*", "Harga/satuan*", "Satuan*", "Stok*");
}); });
\ No newline at end of file
...@@ -170,7 +170,8 @@ const FormProduk = ({ onSubmit, initialData = null }) => { ...@@ -170,7 +170,8 @@ const FormProduk = ({ onSubmit, initialData = null }) => {
{errors.price && <ErrorDiv>Harga Produk tidak boleh kosong</ErrorDiv>} {errors.price && <ErrorDiv>Harga Produk tidak boleh kosong</ErrorDiv>}
</RowInput> </RowInput>
<RowInput> <RowInput>
<LabelInput htmlFor="stock">Stok </LabelInput> <LabelInput htmlFor="stock">Stok
<span css={css`color:red`}>*</span></LabelInput>
<InputForm <InputForm
data-testid="stock-produk-input" data-testid="stock-produk-input"
type="number" type="number"
...@@ -180,7 +181,8 @@ const FormProduk = ({ onSubmit, initialData = null }) => { ...@@ -180,7 +181,8 @@ const FormProduk = ({ onSubmit, initialData = null }) => {
{errors.stock && <ErrorDiv>Stok Produk tidak boleh kosong</ErrorDiv>} {errors.stock && <ErrorDiv>Stok Produk tidak boleh kosong</ErrorDiv>}
</RowInput> </RowInput>
<RowInput> <RowInput>
<LabelInput htmlFor="unit">Satuan </LabelInput> <LabelInput htmlFor="unit">Satuan
<span css={css`color:red`}>*</span></LabelInput>
<InputForm <InputForm
data-testid="unit-produk-input" data-testid="unit-produk-input"
name="unit" name="unit"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment