solidus_admin_bar 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e66324464ed7ae44bf5374a6c1e53c27350febd954ef6e6ccb4adb11443eb53
-  data.tar.gz: 5ebf55dee0ce160bb3be80e8fc3802030c4999d9334e8ff0552c0c5cab9988f4
+  metadata.gz: 1c145c14ee4bb4a2893299144422d7380ffa6922c9ccfac642cf478d2766cb05
+  data.tar.gz: bcff3969f95369b8b0b6b3c2e29c3f08f0be7fba291495ab096c519d3c13f3a7
 SHA512:
-  metadata.gz: a74b9f9ae467b09daca7febff51d17c9598ef6a417fc5f8b30ac894849a4dccbbec95cca17698e417dfa5efa6b3667b337b3519fff107adf3a934b171143a03a
-  data.tar.gz: 3fc6cd443a87306f0dc0a98b3205dc03eb801d957a42f57abd073e3901e0f912b7adbb73c8bf2d8887f8f477b144b3a6faa87bf124866ff36348d901c78b5ab3
+  metadata.gz: d22e60779be9b6c400790f1b110631abb2dad2844d0c7a94ee7fa3dc3333fd24ce2acc5a68e6fa05dedca57b30e52fe598c611528bf5a9c53cb56ecc59334494
+  data.tar.gz: e3e55d0acb39ae5e8a758fa5c5470ab374b8c3ad784060af8cb5cc0e3a4b411036cc98403ac1de93498c47e8d9ee358c4ae1881fd185dc3adbe811b1b34a210c

data/README.md

@@ -1,9 +1,15 @@
 # Solidus Admin Bar
 
 [![CircleCI](https://circleci.com/gh/QuintinAdam/solidus_admin_bar.svg?style=shield)](https://circleci.com/gh/QuintinAdam/solidus_admin_bar)
-[![codecov](https://codecov.io/gh/QuintinAdam/solidus_admin_bar/branch/master/graph/badge.svg)](https://codecov.io/gh/QuintinAdam/solidus_admin_bar)
+[![codecov](https://codecov.io/gh/QuintinAdam/solidus_admin_bar/branch/main/graph/badge.svg)](https://codecov.io/gh/QuintinAdam/solidus_admin_bar)
 
-This extension adds a admin navbar to the frontend of your Solidus store. It allows for a quick link to the admin dashboard. If you are on the taxon page it has quick links to edit the taxons. If you are in the product page, it has quick actions to all the product edit links.
+This extension adds an admin navbar to the frontend of your Solidus store. It allows for a quick link to the admin dashboard. 
+
+The admin bar gets displayed at the top of each page to users logged in as an admin. It works with following the entities:
+* Products
+* Taxons/Taxonomies
+* Pages  ([solidus_static_content](https://github.com/solidusio-contrib/solidus_static_content))
+* Related Products  ([solidus_related_products](https://github.com/solidusio-contrib/solidus_related_products))
 
 ## Installation
 

data/app/overrides/admin_bar.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Deface::Override.new(
   virtual_path: "spree/layouts/spree_application",
   name: "admin_bar",

data/lib/generators/solidus_admin_bar/install/install_generator.rb

@@ -9,7 +9,6 @@ module SolidusAdminBar
       def add_stylesheets
         inject_into_file 'vendor/assets/stylesheets/spree/frontend/all.css', " *= require spree/frontend/solidus_admin_bar\n", before: %r{\*/}, verbose: true # rubocop:disable Layout/LineLength
       end
-
     end
   end
 end

data/lib/solidus_admin_bar/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SolidusAdminBar
-  VERSION = '3.0.1'
+  VERSION = '3.0.2'
 end

data/solidus_admin_bar.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.metadata['source_code_uri'] = 'https://github.com/QuintinAdam/solidus_admin_bar'
   spec.metadata['changelog_uri'] = 'https://github.com/QuintinAdam/solidus_admin_bar/blob/master/CHANGELOG.md'
 
-  spec.required_ruby_version = Gem::Requirement.new('~> 2.5')
+  spec.required_ruby_version = '>= 2.5.0'
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.

data/spec/spec_helper.rb

@@ -40,5 +40,4 @@ RSpec.configure do |config|
   if Spree.solidus_gem_version < Gem::Version.new('2.11')
     config.extend Spree::TestingSupport::AuthorizationHelpers::Request, type: :system
   end
-
 end

data/spec/system/admin_bar_spec.rb

@@ -2,136 +2,125 @@
 
 require 'spec_helper'
 
-context 'admin bar home page' do
-  context "an admin user" do
-    before do
-      sign_in_as_admin!
+describe 'Admin Bar', type: :system do
+  describe 'home page' do
+    context "when an admin user" do
+      before do
+        sign_in_as_admin!
+        visit spree.root_path
+      end
+
+      it "displays the admin bar and links to dashboard" do
+        within('#admin_bar'){ click_link 'Dashboard' }
+        expect(page).to have_current_path(spree.admin_orders_path, ignore_query: true)
+      end
+    end
+
+    it "does not allow a regular user to see the admin bar" do
+      sign_in_as_user!
       visit spree.root_path
+      expect(page).not_to have_content('Dashboard')
     end
-    it "should display the admin bar and links to dashboard" do
-      within('#admin_bar'){ click_link 'Dashboard' }
-      expect(current_path).to eq(spree.admin_orders_path)
+
+    it "does not allow a guest user to see the admin bar" do
+      visit spree.root_path
+      expect(page).not_to have_content('Dashboard')
     end
   end
 
-  it "does not allow a regular user to see the admin bar" do
-    sign_in_as_user!
-    visit spree.root_path
-    expect(page).not_to have_content('Dashboard')
-  end
+  describe 'products admin bar' do
+    let!(:product) { create(:product, name: "Superman T-Shirt") }
 
-  it "does not allow a guest user to see the admin bar" do
-    visit spree.root_path
-    expect(page).not_to have_content('Dashboard')
-  end
-end
+    context "when an admin user" do
+      before do
+        sign_in_as_admin!
+        visit spree.root_path
+        click_link 'Superman T-Shirt'
+      end
+
+      it "can navigate to edit the product in the admin" do
+        within('#admin_bar'){ click_link 'Edit Product' }
+        expect(page).to have_current_path(spree.edit_admin_product_path(product), ignore_query: true)
+      end
+
+      it "allows an admin user to edit product images in the admin" do
+        within('#admin_bar'){ click_link 'Images' }
+        expect(page).to have_current_path(spree.admin_product_images_path(product), ignore_query: true)
+      end
 
-describe 'products admin bar' do
-  let!(:product) { create(:product, name: "Superman T-Shirt") }
-  context "an admin user" do
-    before do
-      sign_in_as_admin!
+      it "allows an admin user to edit variants in the admin" do
+        within('#admin_bar'){ click_link 'Variants' }
+        expect(page).to have_current_path(spree.admin_product_variants_path(product), ignore_query: true)
+      end
+
+      it "allows an admin user to edit prices in the admin" do
+        within('#admin_bar'){ click_link 'Prices' }
+        expect(page).to have_current_path(spree.admin_product_prices_path(product), ignore_query: true)
+      end
+
+      it "allows an admin user to edit properties in the admin" do
+        within('#admin_bar'){ click_link 'Properties' }
+        expect(page).to have_current_path(spree.admin_product_product_properties_path(product), ignore_query: true)
+      end
+
+      it "allows an admin user to edit stock in the admin" do
+        within('#admin_bar'){ click_link 'Stock' }
+        expect(page).to have_current_path(spree.admin_product_stock_path(product), ignore_query: true)
+      end
+    end
+
+    it "does not allow a regular user to navigate to the admin" do
+      sign_in_as_user!
       visit spree.root_path
       click_link 'Superman T-Shirt'
+      expect(page).not_to have_content('Edit Product')
     end
-    it "can navigate to edit the product in the admin" do
-      within('#admin_bar'){ click_link 'Edit Product' }
-      expect(page).to have_content(product.name)
-      expect(current_path).to eq(spree.edit_admin_product_path(product))
-    end
-    it "allows an admin user to edit product images in the admin" do
-      within('#admin_bar'){ click_link 'Images' }
-      expect(current_path).to eq(spree.admin_product_images_path(product))
-    end
-    it "allows an admin user to edit variants in the admin" do
-      within('#admin_bar'){ click_link 'Variants' }
-      expect(current_path).to eq(spree.admin_product_variants_path(product))
-    end
-    it "allows an admin user to edit prices in the admin" do
-      within('#admin_bar'){ click_link 'Prices' }
-      expect(current_path).to eq(spree.admin_product_prices_path(product))
-    end
-    it "allows an admin user to edit properties in the admin" do
-      within('#admin_bar'){ click_link 'Properties' }
-      expect(current_path).to eq(spree.admin_product_product_properties_path(product))
-    end
-    it "allows an admin user to edit stock in the admin" do
-      within('#admin_bar'){ click_link 'Stock' }
-      expect(current_path).to eq(spree.admin_product_stock_path(product))
+
+    it "does not allow a guest user to navigate to the admin" do
+      visit spree.root_path
+      click_link 'Superman T-Shirt'
+      expect(page).not_to have_content('Edit Product')
     end
-    # it "allows an admin user to edit related products in the admin" do
-    #   within('#admin_bar'){ click_link 'Related' }
-    #   expect(current_path).to eq(spree.related_admin_product_path(product))
-    # end
   end
 
-  it "does not allow a regular user to navigate to the admin" do
-    sign_in_as_user!
-    visit spree.root_path
-    click_link 'Superman T-Shirt'
-    expect(page).not_to have_content('Dashboard')
-    expect(page).to_not have_content('Edit Product')
-  end
+  describe 'taxons admin bar' do
+    let!(:taxonomy) { create(:taxonomy, name: "Category") }
+    let!(:taxon) { taxonomy.root.children.create(name: "Clothing", taxonomy_id: taxonomy.id) }
 
-  it "does not allow a guest user to navigate to the admin" do
-    visit spree.root_path
-    click_link 'Superman T-Shirt'
-    expect(page).not_to have_content('Dashboard')
-    expect(page).to_not have_content('Edit Product')
-  end
-end
+    context "when an admin user" do
+      before do
+        sign_in_as_admin!
+        visit spree.root_path
+        click_link 'Clothing'
+      end
+
+      it "can navigate to edit the taxonomy in the admin" do
+        within('#admin_bar'){ click_link 'Edit Taxonomy' }
+        expect(page).to have_current_path(spree.edit_admin_taxonomy_path(taxonomy), ignore_query: true)
+      end
+
+      it "can navigate to edit the taxon in the admin" do
+        within('#admin_bar'){ click_link 'Edit Taxon' }
+        expect(page).to have_current_path(spree.edit_admin_taxonomy_taxon_path(taxonomy.id, taxon.id),
+          ignore_query: true)
+      end
+    end
 
-describe 'taxons admin bar' do
-  let!(:taxonomy) { create(:taxonomy, name: "Category") }
-  let!(:taxon) { taxonomy.root.children.create(name: "Clothing", taxonomy_id: taxonomy.id) }
-  context "an admin user" do
-    before do
-      sign_in_as_admin!
+    it "does not allow a normal user to navigate to the admin" do
+      sign_in_as_user!
       visit spree.root_path
       click_link 'Clothing'
+      expect(page).not_to have_content('Edit Taxonomy')
     end
-    it "can navigate to edit the taxonomy in the admin" do
-      within('#admin_bar'){ click_link 'Edit Taxonomy' }
-      expect(current_path).to eq(spree.edit_admin_taxonomy_path(taxonomy))
-    end
-    it "can navigate to edit the taxon in the admin" do
-      within('#admin_bar'){ click_link 'Edit Taxon' }
-      expect(current_path).to eq(spree.edit_admin_taxonomy_taxon_path(taxonomy.id, taxon.id))
+
+    it "does not allow a guest user to navigate to the admin" do
+      visit spree.root_path
+      click_link 'Clothing'
+      expect(page).not_to have_content('Edit Taxonomy')
     end
   end
-  it "does not allow a normal user to navigate to the admin" do
-    sign_in_as_user!
-    visit spree.root_path
-    click_link 'Clothing'
-    expect(page).not_to have_content('Dashboard')
-    expect(page).to_not have_content('Edit Taxonomy')
-    expect(page).to_not have_content('Edit Taxon')
-  end
-  it "does not allow a guest user to navigate to the admin" do
-    visit spree.root_path
-    click_link 'Clothing'
-    expect(page).not_to have_content('Dashboard')
-    expect(page).to_not have_content('Edit Taxonomy')
-    expect(page).to_not have_content('Edit Taxon')
-  end
 end
 
-# describe 'pages admin bar' do
-#   let!(:store) { create(:store, default: true) }
-#   let!(:content_page) { Spree::Page.create!(slug: '/page2', title: 'TestPage2', body: 'Body2', visible: true, stores: [store]) }
-#   it "an admin user can navigate to edit the page in the admin" do
-#     sign_in_as_admin!
-#     visit '/page2'
-#     expect(page).to have_content('Edit Page')
-#     within('#admin_bar'){ click_link 'Edit Page' }
-#     current_path.expect == spree.edit_admin_page_path(content_page)
-#   end
-#   it "does not allow a regular user to navigate to the admin" do
-#     visit '/page2'
-#     page.expect_not have_content('Edit Page')
-#   end
-# end
-
 def sign_in_as_admin!
   user = create(:admin_user)
   visit '/login'
@@ -147,8 +136,3 @@ def sign_in_as_user!
   fill_in 'Password', with: 'secret'
   click_button 'Login'
 end
-
-def create_taxon
-  taxonomy = create(:taxonomy, name: "Category")
-  create(:taxon, name: "T-Shirts", parent: taxonomy.root, taxonomy: taxonomy)
-end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solidus_admin_bar
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - QuintinAdam
@@ -110,9 +110,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="