Fix failing tests

src/napari_imagej/types/converters/images.py

@@ -68,7 +68,7 @@ def _image_layer_to_dataset(image: Image, **kwargs) -> "jc.Dataset":
  for i in range(dataset.numDimensions()):
  axis = dataset.axis(i)
  # Overwrite EnumeratedAxes with LinearAxes
- if isinstance(axis, jc.EnumeratedAxis):
+ if isinstance(axis, (jc.EnumeratedAxis, jc.DefaultLinearAxis)):
  # Copy the dim name, unless it's unnamed
  # in that case, assign it with X/Y/Z, if they aren't used already
  if any(x in axis.type().getLabel() for x in ["dim", "Unknown"]) and len(

src/napari_imagej/widgets/parameter_widgets.py

@@ -134,7 +134,7 @@ def _default_layer(self) -> Optional[Layer]:
  the (first) input. We find the (first) input in this function.
  """
  # Attempt to guess a good size based off of the first image input
- for widget in self.parent._magic_widget.parent._magic_widget:
+ for widget in self.parent:
  if widget is self:
  continue
  if isinstance(widget, ComboBox) and issubclass(widget.annotation, Layer):

tests/widgets/test_napari_imagej.py

@@ -40,10 +40,17 @@ def test_widget_subwidget_layout(imagej_widget: NapariImageJWidget):
 
 def test_keymaps(make_napari_viewer, qtbot):
  """Tests that 'Ctrl+L' is added to the keymap by ImageJWidget"""
+
+ def find_keybind(kb: str) -> bool:
+ for k, _ in viewer.keymap.items():
+ if str(k) == kb:
+ return True
+ return False
+
  viewer: Viewer = make_napari_viewer()
- assert "Control-L" not in viewer.keymap
+ assert not find_keybind("Ctrl+L")
  NapariImageJWidget(viewer)
- assert "Control-L" in viewer.keymap
+ assert find_keybind("Ctrl+L")
  # TODO: I can't seem to figure out how to assert that pressing 'L'
  # sets the focus of the search bar.
  # Typing viewer.keymap['L'](viewer) does nothing. :(