Skip to content
Snippets Groups Projects
Commit da993300 authored by Oda Alida Fønstelien Hjelljord's avatar Oda Alida Fønstelien Hjelljord
Browse files

Merge branch 'new_item_fix' into 'main'

new item fix

See merge request !79
parents c6258192 c3087ca4
No related branches found
No related tags found
1 merge request!79new item fix
Pipeline #179518 passed
...@@ -66,6 +66,7 @@ ...@@ -66,6 +66,7 @@
</div> </div>
</div> </div>
<!-- Grupper -->
<div class="mb-6"> <div class="mb-6">
<label <label
class="block text-sm font-medium text-gray-900 dark:text-gray-400" class="block text-sm font-medium text-gray-900 dark:text-gray-400"
...@@ -93,29 +94,6 @@ ...@@ -93,29 +94,6 @@
<label class="text-error text-sm block">{{ groupErrorMessage }}</label> <label class="text-error text-sm block">{{ groupErrorMessage }}</label>
</div> </div>
<!-- error message for select box -->
<div
class="overflow-auto w-full h-32 mt-2 text-base list-none bg-white rounded divide-y divide-gray-100 dark:bg-gray-700"
>
<ul class="py-1" aria-labelledby="dropdownDefault">
<li>
<div class="form-check" v-for="group in groups" :key="group">
<input
class="form-check-input appearance-none h-4 w-4 border border-gray-300 rounded-sm bg-white checked:bg-primary-medium checked:bg-primary-medium focus:outline-none transition duration-200 mt-1 align-top bg-no-repeat bg-center bg-contain float-left mr-2 cursor-pointer"
type="checkbox"
:value="group.communityId"
@change="onChangeGroup($event)"
>
<label class="form-check-label inline-block text-gray-800">
{{ group.name }}
</label>
</div>
</li>
</ul>
</div>
<label class="text-error text-sm block">{{ groupErrorMessage }}</label>
<!-- price --> <!-- price -->
<div class="mb-6 mt-4" :class="{ error: v$.item.price.$errors.length }"> <div class="mb-6 mt-4" :class="{ error: v$.item.price.$errors.length }">
<label <label
......
...@@ -6,7 +6,6 @@ describe("addNewItem elements rendering", () => { ...@@ -6,7 +6,6 @@ describe("addNewItem elements rendering", () => {
const wrapper = shallowMount(AddNewItem); const wrapper = shallowMount(AddNewItem);
expect(wrapper.find("#titleLabel").text()).toMatch("Tittel"); expect(wrapper.find("#titleLabel").text()).toMatch("Tittel");
expect(wrapper.find("#selectCategoryLabel").text()).toMatch("Kategori");
expect(wrapper.find("#priceLabel").text()).toMatch("Pris"); expect(wrapper.find("#priceLabel").text()).toMatch("Pris");
expect(wrapper.find("#descriptionLabel").text()).toMatch("Beskrivelse"); expect(wrapper.find("#descriptionLabel").text()).toMatch("Beskrivelse");
expect(wrapper.find("#imageLabel").text()).toMatch("Bilde"); expect(wrapper.find("#imageLabel").text()).toMatch("Bilde");
...@@ -19,10 +18,6 @@ describe("addNewItem elements rendering", () => { ...@@ -19,10 +18,6 @@ describe("addNewItem elements rendering", () => {
await titleInput.setValue("Dyson"); await titleInput.setValue("Dyson");
expect(titleInput.element.value).toBe("Dyson"); expect(titleInput.element.value).toBe("Dyson");
const selectedCategory = wrapper.find("#categories");
await selectedCategory.setValue("Hage");
expect(selectedCategory.element.value).toBe("Hage");
const priceInput = wrapper.find("#price"); const priceInput = wrapper.find("#price");
await priceInput.setValue(500); await priceInput.setValue(500);
expect(priceInput.element.value).toBe("500"); expect(priceInput.element.value).toBe("500");
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment