Merge pull request #877 from jhawthorn/fix_taxon_edit_icon

Fix taxon edit icon
solidusio · Feb 18, 2016 · 7fc6f2d · 7fc6f2d
2 parents 902ad00 + d46c168
commit 7fc6f2d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/backend/app/assets/javascripts/spree/backend/templates/taxons/_tree.hbs b/backend/app/assets/javascripts/spree/backend/templates/taxons/_tree.hbs
@@ -5,7 +5,7 @@
  {{name}}
  <div class="actions right">
  <a href="#" class="js-taxon-add-child fa fa-plus icon_link no-text"></a>
- <a href="<%= spree.admin_path %>/taxonomies/{{taxonomy_id}}/taxons/{{id}}/edit" class="fa fa-edit icon_link no-text"></a>
+ <a href="/admin/taxonomies/{{taxonomy_id}}/taxons/{{id}}/edit" class="fa fa-edit icon_link no-text"></a>
  <a href="#" class="js-taxon-delete fa fa-trash icon_link no-text"></a>
  </div>
  </div>

diff --git a/backend/spec/features/admin/taxons_spec.rb b/backend/spec/features/admin/taxons_spec.rb
@@ -29,5 +29,13 @@
 
  click_on('Add taxon')
  expect(page).to have_content('New node')
+
+ # Little tricky to select the right taxon. Since the text is technically
+ # inside the top-level li.
+ within '#taxonomy_tree li li', text: 'New node' do
+ click_icon :edit
+ end
+
+ expect(page).to have_current_path %r{/admin/taxonomies/\d+/taxons/\d+/edit}
  end
 end