From 2f5b0a5afbe508719a4a8b9db513e0fce0a7d633 Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Wed, 7 Aug 2019 09:59:55 +0100
Subject: [PATCH] Remove product import FeatureFlag

---
 app/models/feature_flags.rb                   | 20 -------------
 .../admin/products/index/_filters.html.haml   | 13 ++++-----
 spec/models/feature_flags_spec.rb             | 28 -------------------
 3 files changed, 6 insertions(+), 55 deletions(-)
 delete mode 100644 app/models/feature_flags.rb
 delete mode 100644 spec/models/feature_flags_spec.rb

diff --git a/app/models/feature_flags.rb b/app/models/feature_flags.rb
deleted file mode 100644
index 4354e0c414..0000000000
--- a/app/models/feature_flags.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-# Tells whether a particular feature is enabled or not
-class FeatureFlags
-  # Constructor
-  #
-  # @param user [User]
-  def initialize(user)
-    @user = user
-  end
-
-  # Checks whether product import is enabled for the specified user
-  #
-  # @return [Boolean]
-  def product_import_enabled?
-    user.superadmin?
-  end
-
-  private
-
-  attr_reader :user
-end
diff --git a/app/views/spree/admin/products/index/_filters.html.haml b/app/views/spree/admin/products/index/_filters.html.haml
index 9c08c9adda..72458b3391 100644
--- a/app/views/spree/admin/products/index/_filters.html.haml
+++ b/app/views/spree/admin/products/index/_filters.html.haml
@@ -12,13 +12,12 @@
     %label{ for: 'category_filter' }= t 'category'
     %br
     %select.fullwidth{ id: 'category_filter', 'ofn-select2-min-search' => 5, ng: {model: 'categoryFilter', options: 'taxon.id as taxon.name for taxon in filterTaxons'} }
-  - if FeatureFlags.new(@current_user).product_import_enabled?
-    .filter_select.three.columns
-      %label{ for: 'import_filter' } Import Date
-      %br
-      %select.fullwidth{ id: 'import_date_filter', 'ofn-select2-min-search' => 5, ng: {model: 'importDateFilter', init: "importDates = #{@import_dates}; showLatestImport = #{@show_latest_import}"}}
-        %option{value: "{{date.id}}", ng: {repeat: "date in importDates track by date.id" }}
-          {{date.name}}
+  .filter_select.three.columns
+    %label{ for: 'import_filter' } Import Date
+    %br
+    %select.fullwidth{ id: 'import_date_filter', 'ofn-select2-min-search' => 5, ng: {model: 'importDateFilter', init: "importDates = #{@import_dates}; showLatestImport = #{@show_latest_import}"}}
+      %option{value: "{{date.id}}", ng: {repeat: "date in importDates track by date.id" }}
+        {{date.name}}
 
   .filter_clear.three.columns.omega
     %label{ for: 'clear_all_filters' }
diff --git a/spec/models/feature_flags_spec.rb b/spec/models/feature_flags_spec.rb
deleted file mode 100644
index a14bb4f01f..0000000000
--- a/spec/models/feature_flags_spec.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-require 'spec_helper'
-
-describe FeatureFlags do
-  let(:user) { build_stubbed(:user) }
-  let(:feature_flags) { described_class.new(user) }
-
-  describe '#product_import_enabled?' do
-    context 'when the user is superadmin' do
-      before do
-        allow(user).to receive(:superadmin?) { true }
-      end
-
-      it 'returns true' do
-        expect(feature_flags.product_import_enabled?).to eq(true)
-      end
-    end
-
-    context 'when the user is not superadmin' do
-      before do
-        allow(user).to receive(:superadmin?) { false }
-      end
-
-      it 'returns false' do
-        expect(feature_flags.product_import_enabled?).to eq(false)
-      end
-    end
-  end
-end