flipper 1.3.0 → 1.3.6

data/spec/flipper/adapters/strict_spec.rb

@@ -29,13 +29,13 @@ RSpec.describe Flipper::Adapters::Strict do
 
     context "#get" do
       it "raises an error for unknown feature" do
-        expect(silence { subject.get(feature) }).to match(/Could not find feature "unknown"/)
+        expect(capture_output { subject.get(feature) }).to match(/Could not find feature "unknown"/)
       end
     end
 
     context "#get_multi" do
       it "raises an error for unknown feature" do
-        expect(silence { subject.get_multi([feature]) }).to match(/Could not find feature "unknown"/)
+        expect(capture_output { subject.get_multi([feature]) }).to match(/Could not find feature "unknown"/)
       end
     end
   end

data/spec/flipper/cli_spec.rb

@@ -5,6 +5,8 @@ RSpec.describe Flipper::CLI do
   let(:stderr) { StringIO.new }
   let(:cli) { Flipper::CLI.new(stdout: stdout, stderr: stderr) }
 
+  Result = Struct.new(:status, :stdout, :stderr, keyword_init: true)
+
   before do
     # Prentend stdout/stderr a TTY to test colorization
     allow(stdout).to receive(:tty?).and_return(true)
@@ -12,7 +14,7 @@ RSpec.describe Flipper::CLI do
   end
 
   # Infer the command from the description
-  subject(:argv) do
+  let(:argv) do
     descriptions = self.class.parent_groups.map {|g| g.metadata[:description_args] }.reverse.flatten.drop(1)
     descriptions.map { |arg| Shellwords.split(arg) }.flatten
   end
@@ -26,7 +28,7 @@ RSpec.describe Flipper::CLI do
       status = e.status
     end
 
-    OpenStruct.new(status: status, stdout: stdout.string, stderr: stderr.string)
+    Result.new(status: status, stdout: stdout.string, stderr: stderr.string)
   end
 
   before do

data/spec/flipper/cloud/dsl_spec.rb

@@ -45,7 +45,7 @@ RSpec.describe Flipper::Cloud::DSL do
     end
 
     let(:cloud_configuration) do
-      cloud_configuration = Flipper::Cloud::Configuration.new({
+      Flipper::Cloud::Configuration.new({
         token: "asdf",
         sync_secret: "tasty",
         local_adapter: local_adapter

data/spec/flipper/cloud/telemetry/backoff_policy_spec.rb

@@ -4,8 +4,8 @@ RSpec.describe Flipper::Cloud::Telemetry::BackoffPolicy do
   context "#initialize" do
     it "with no options" do
       policy = described_class.new
-      expect(policy.min_timeout_ms).to eq(1_000)
-      expect(policy.max_timeout_ms).to eq(30_000)
+      expect(policy.min_timeout_ms).to eq(30_000)
+      expect(policy.max_timeout_ms).to eq(120_000)
       expect(policy.multiplier).to eq(1.5)
       expect(policy.randomization_factor).to eq(0.5)
     end
@@ -87,7 +87,7 @@ RSpec.describe Flipper::Cloud::Telemetry::BackoffPolicy do
         randomization_factor: 0.5,
       })
       10.times { policy.next_interval }
-      expect(policy.next_interval).to eq(10_000)
+      expect(policy.next_interval).to be_within(10_000*0.1).of(10_000)
     end
   end
 

data/spec/flipper/cloud/telemetry/submitter_spec.rb

@@ -71,15 +71,15 @@ RSpec.describe Flipper::Cloud::Telemetry::Submitter do
         to_return(status: 429, body: "{}").
         to_return(status: 200, body: "{}")
       instance = described_class.new(cloud_configuration)
-      expect(instance.backoff_policy.min_timeout_ms).to eq(1_000)
-      expect(instance.backoff_policy.max_timeout_ms).to eq(30_000)
+      expect(instance.backoff_policy.min_timeout_ms).to eq(30_000)
+      expect(instance.backoff_policy.max_timeout_ms).to eq(120_000)
     end
 
     it "tries 10 times by default" do
       stub_request(:post, "https://www.flippercloud.io/adapter/telemetry").
         to_return(status: 500, body: "{}")
       subject.call(enabled_metrics)
-      expect(subject.backoff_policy.retries).to eq(9) # 9 retries + 1 initial attempt
+      expect(subject.backoff_policy.retries).to eq(4) # 4 retries + 1 initial attempt
     end
 
     [
@@ -105,7 +105,7 @@ RSpec.describe Flipper::Cloud::Telemetry::Submitter do
         stub_request(:post, "https://www.flippercloud.io/adapter/telemetry").
           to_raise(error_class)
         subject.call(enabled_metrics)
-        expect(subject.backoff_policy.retries).to eq(9)
+        expect(subject.backoff_policy.retries).to eq(4)
       end
     end
 

data/spec/flipper/cloud/telemetry_spec.rb

@@ -25,7 +25,7 @@ RSpec.describe Flipper::Cloud::Telemetry do
 
     expect(telemetry.interval).to eq(60)
     expect(telemetry.timer.execution_interval).to eq(60)
-    expect(stub).to have_been_requested
+    expect(stub).to have_been_requested.at_least_once
   end
 
   it "phones home and updates telemetry interval if present" do
@@ -45,7 +45,7 @@ RSpec.describe Flipper::Cloud::Telemetry do
 
     expect(telemetry.interval).to eq(120)
     expect(telemetry.timer.execution_interval).to eq(120)
-    expect(stub).to have_been_requested
+    expect(stub).to have_been_requested.at_least_once
   end
 
   it "phones home and requests shutdown if telemetry-shutdown header is true" do
@@ -67,7 +67,7 @@ RSpec.describe Flipper::Cloud::Telemetry do
       result: true,
     })
     telemetry.stop
-    expect(stub).to have_been_requested
+    expect(stub).to have_been_requested.at_least_once
     expect(output.string).to match(/action=telemetry_shutdown message=The server has requested that telemetry be shut down./)
   end
 
@@ -90,7 +90,7 @@ RSpec.describe Flipper::Cloud::Telemetry do
       result: true,
     })
     telemetry.stop
-    expect(stub).to have_been_requested
+    expect(stub).to have_been_requested.at_least_once
     expect(output.string).not_to match(/action=telemetry_shutdown message=The server has requested that telemetry be shut down./)
   end
 
@@ -122,7 +122,7 @@ RSpec.describe Flipper::Cloud::Telemetry do
     # Check the conig interval and the timer interval.
     expect(telemetry.interval).to eq(120)
     expect(telemetry.timer.execution_interval).to eq(120)
-    expect(stub).to have_been_requested.times(10)
+    expect(stub).to have_been_requested.times(5)
   end
 
   it "doesn't try to update telemetry interval from error if not response error" do
@@ -152,7 +152,7 @@ RSpec.describe Flipper::Cloud::Telemetry do
 
     expect(telemetry.interval).to eq(60)
     expect(telemetry.timer.execution_interval).to eq(60)
-    expect(stub).to have_been_requested.times(10)
+    expect(stub).to have_been_requested.times(5)
   end
 
   describe '#record' do

data/spec/flipper/cloud_spec.rb

@@ -43,6 +43,7 @@ RSpec.describe Flipper::Cloud do
 
   context 'initialize with token and options' do
     it 'sets correct url' do
+      stub_request(:any, %r{fakeflipper.com}).to_return(status: 200)
       instance = described_class.new(token: 'asdf', url: 'https://www.fakeflipper.com/sadpanda')
       # pardon the nesting...
       memoized = instance.adapter
@@ -78,27 +79,31 @@ RSpec.describe Flipper::Cloud do
   end
 
   it 'can set debug_output' do
+    instance = Flipper::Adapters::Http::Client.new(token: 'asdf', url: 'https://www.flippercloud.io/adapter')
     expect(Flipper::Adapters::Http::Client).to receive(:new)
-      .with(hash_including(debug_output: STDOUT)).at_least(:once)
+      .with(hash_including(debug_output: STDOUT)).at_least(:once).and_return(instance)
     described_class.new(token: 'asdf', debug_output: STDOUT)
   end
 
   it 'can set read_timeout' do
+    instance = Flipper::Adapters::Http::Client.new(token: 'asdf', url: 'https://www.flippercloud.io/adapter')
     expect(Flipper::Adapters::Http::Client).to receive(:new)
-      .with(hash_including(read_timeout: 1)).at_least(:once)
+      .with(hash_including(read_timeout: 1)).at_least(:once).and_return(instance)
     described_class.new(token: 'asdf', read_timeout: 1)
   end
 
   it 'can set open_timeout' do
+    instance = Flipper::Adapters::Http::Client.new(token: 'asdf', url: 'https://www.flippercloud.io/adapter')
     expect(Flipper::Adapters::Http::Client).to receive(:new)
-      .with(hash_including(open_timeout: 1)).at_least(:once)
+      .with(hash_including(open_timeout: 1)).at_least(:once).and_return(instance)
     described_class.new(token: 'asdf', open_timeout: 1)
   end
 
   if RUBY_VERSION >= '2.6.0'
     it 'can set write_timeout' do
+      instance = Flipper::Adapters::Http::Client.new(token: 'asdf', url: 'https://www.flippercloud.io/adapter')
       expect(Flipper::Adapters::Http::Client).to receive(:new)
-        .with(hash_including(open_timeout: 1)).at_least(:once)
+        .with(hash_including(open_timeout: 1)).at_least(:once).and_return(instance)
       described_class.new(token: 'asdf', open_timeout: 1)
     end
   end

data/spec/flipper/dsl_spec.rb

@@ -225,9 +225,6 @@ RSpec.describe Flipper::DSL do
 
   describe '#enable_group/disable_group' do
     it 'enables and disables the feature for group' do
-      actor = Flipper::Actor.new(5)
-      group = Flipper.register(:fives) { |actor| actor.flipper_id == 5 }
-
       expect(subject[:stats].groups_value).to be_empty
       subject.enable_group(:stats, :fives)
       expect(subject[:stats].groups_value).to eq(Set['fives'])

data/spec/flipper/engine_spec.rb

@@ -12,6 +12,7 @@ RSpec.describe Flipper::Engine do
   end
 
   before do
+    stub_request(:get, /flippercloud\.io/).to_return(status: 200, body: "{}")
     Rails.application = nil
     ActiveSupport::Dependencies.autoload_paths = ActiveSupport::Dependencies.autoload_paths.dup
     ActiveSupport::Dependencies.autoload_once_paths = ActiveSupport::Dependencies.autoload_once_paths.dup
@@ -29,7 +30,7 @@ RSpec.describe Flipper::Engine do
 
   let(:config) { application.config.flipper }
 
-  subject { application.initialize! }
+  subject { SpecHelpers.silence { application.initialize! } }
 
   shared_examples 'config.strict' do
     let(:adapter) { Flipper.adapter.adapter }
@@ -233,7 +234,7 @@ RSpec.describe Flipper::Engine do
     it "initializes cloud configuration" do
       stub_request(:get, /flippercloud\.io/).to_return(status: 200, body: "{}")
 
-      application.initialize!
+      silence { application.initialize! }
 
       expect(Flipper.instance).to be_a(Flipper::Cloud::DSL)
       expect(Flipper.instance.instrumenter).to be_a(Flipper::Cloud::Telemetry::Instrumenter)
@@ -263,7 +264,7 @@ RSpec.describe Flipper::Engine do
       }
 
       it "configures webhook app" do
-        application.initialize!
+        silence { application.initialize! }
 
         stub = stub_request(:get, "https://www.flippercloud.io/adapter/features?exclude_gate_names=true").with({
           headers: { "flipper-cloud-token" => ENV["FLIPPER_CLOUD_TOKEN"] },
@@ -278,7 +279,7 @@ RSpec.describe Flipper::Engine do
 
     context "without CLOUD_SYNC_SECRET" do
       it "does not configure webhook app" do
-        application.initialize!
+        silence { application.initialize! }
 
         post "/_flipper"
         expect(last_response.status).to eq(404)
@@ -288,7 +289,7 @@ RSpec.describe Flipper::Engine do
     context "without FLIPPER_CLOUD_TOKEN" do
       it "gracefully skips configuring webhook app" do
         ENV["FLIPPER_CLOUD_TOKEN"] = nil
-        application.initialize!
+        silence { application.initialize! }
         expect(Flipper.instance).to be_a(Flipper::DSL)
 
         post "/_flipper"
@@ -324,7 +325,7 @@ RSpec.describe Flipper::Engine do
     end
 
     it "enables cloud" do
-      application.initialize!
+      silence { application.initialize! }
       expect(ENV["FLIPPER_CLOUD_TOKEN"]).to eq("credentials-token")
       expect(ENV["FLIPPER_CLOUD_SYNC_SECRET"]).to eq("credentials-secret")
       expect(Flipper.instance).to be_a(Flipper::Cloud::DSL)
@@ -339,7 +340,7 @@ RSpec.describe Flipper::Engine do
 
   describe "config.actor_limit" do
     let(:adapter) do
-      application.initialize!
+      silence { application.initialize! }
       Flipper.adapter.adapter.adapter
     end
 

data/spec/flipper/feature_spec.rb

@@ -76,6 +76,26 @@ RSpec.describe Flipper::Feature do
         expect(subject.enabled?(actors)).to be(false)
       end
     end
+
+    context "for an object that implements .nil? == true" do
+      let(:actor) { Flipper::Actor.new("User;1") }
+
+      before do
+        def actor.nil?
+          true
+        end
+      end
+
+      it 'returns true if feature is enabled' do
+        subject.enable
+        expect(subject.enabled?(actor)).to be(true)
+      end
+
+      it 'returns false if feature is disabled' do
+        subject.disable
+        expect(subject.enabled?(actor)).to be(false)
+      end
+    end
   end
 
   describe '#to_s' do
@@ -195,7 +215,7 @@ RSpec.describe Flipper::Feature do
 
     it 'is recorded for enable' do
       actor = Flipper::Types::Actor.new(Flipper::Actor.new('1'))
-      gate = subject.gate_for(actor)
+      subject.gate_for(actor)
 
       subject.enable(actor)
 
@@ -210,7 +230,7 @@ RSpec.describe Flipper::Feature do
 
     it 'always instruments flipper type instance for enable' do
       actor = Flipper::Actor.new('1')
-      gate = subject.gate_for(actor)
+      subject.gate_for(actor)
 
       subject.enable(actor)
 
@@ -221,7 +241,6 @@ RSpec.describe Flipper::Feature do
 
     it 'is recorded for disable' do
       thing = Flipper::Types::Boolean.new
-      gate = subject.gate_for(thing)
 
       subject.disable(thing)
 
@@ -266,7 +285,6 @@ RSpec.describe Flipper::Feature do
 
     it 'always instruments flipper type instance for disable' do
       actor = Flipper::Actor.new('1')
-      gate = subject.gate_for(actor)
 
       subject.disable(actor)
 
@@ -709,7 +727,6 @@ RSpec.describe Flipper::Feature do
     context "with expression instance" do
       it "updates gate values to equal expression or clears expression" do
         expression = Flipper.property(:plan).eq("basic")
-        other_expression = Flipper.property(:age).gte(21)
         expect(subject.gate_values.expression).to be(nil)
         subject.enable_expression(expression)
         expect(subject.gate_values.expression).to eq(expression.value)
@@ -721,7 +738,6 @@ RSpec.describe Flipper::Feature do
     context "with Hash" do
       it "updates gate values to equal expression or clears expression" do
         expression = Flipper.property(:plan).eq("basic")
-        other_expression = Flipper.property(:age).gte(21)
         expect(subject.gate_values.expression).to be(nil)
         subject.enable_expression(expression.value)
         expect(subject.gate_values.expression).to eq(expression.value)
@@ -1078,8 +1094,6 @@ RSpec.describe Flipper::Feature do
   describe '#enable_group/disable_group' do
     context 'with symbol group name' do
       it 'updates the gate values to include the group' do
-        actor = Flipper::Actor.new(5)
-        group = Flipper.register(:five_only) { |actor| actor.flipper_id == 5 }
         expect(subject.gate_values.groups).to be_empty
         subject.enable_group(:five_only)
         expect(subject.gate_values.groups).to eq(Set['five_only'])
@@ -1090,8 +1104,6 @@ RSpec.describe Flipper::Feature do
 
     context 'with string group name' do
       it 'updates the gate values to include the group' do
-        actor = Flipper::Actor.new(5)
-        group = Flipper.register(:five_only) { |actor| actor.flipper_id == 5 }
         expect(subject.gate_values.groups).to be_empty
         subject.enable_group('five_only')
         expect(subject.gate_values.groups).to eq(Set['five_only'])
@@ -1102,7 +1114,6 @@ RSpec.describe Flipper::Feature do
 
     context 'with group instance' do
       it 'updates the gate values for the group' do
-        actor = Flipper::Actor.new(5)
         group = Flipper.register(:five_only) { |actor| actor.flipper_id == 5 }
         expect(subject.gate_values.groups).to be_empty
         subject.enable_group(group)

data/spec/flipper/instrumentation/log_subscriber_spec.rb

@@ -1,4 +1,5 @@
 require 'logger'
+require 'active_support/core_ext/object/blank'
 require 'flipper/instrumentation/log_subscriber'
 require 'flipper/adapters/instrumented'
 

data/spec/flipper/instrumentation/statsd_subscriber_spec.rb

@@ -18,7 +18,7 @@ RSpec.describe Flipper::Instrumentation::StatsdSubscriber do
     Flipper.new(adapter, instrumenter: ActiveSupport::Notifications)
   end
 
-  let(:user) { user = Flipper::Actor.new('1') }
+  let(:user) { Flipper::Actor.new('1') }
 
   before do
     described_class.client = statsd_client

data/spec/flipper/middleware/memoizer_spec.rb

@@ -80,7 +80,7 @@ RSpec.describe Flipper::Middleware::Memoizer do
   context 'with preload: true' do
     let(:app) do
       # ensure scoped for builder block, annoying...
-      instance = flipper
+      flipper
       middleware = described_class
 
       Rack::Builder.new do
@@ -141,7 +141,7 @@ RSpec.describe Flipper::Middleware::Memoizer do
   context 'with preload specific' do
     let(:app) do
       # ensure scoped for builder block, annoying...
-      instance = flipper
+      flipper
       middleware = described_class
 
       Rack::Builder.new do
@@ -266,7 +266,7 @@ RSpec.describe Flipper::Middleware::Memoizer do
   context 'with multiple instances' do
     let(:app) do
       # ensure scoped for builder block, annoying...
-      instance = flipper
+      flipper
       middleware = described_class
 
       Rack::Builder.new do
@@ -285,7 +285,7 @@ RSpec.describe Flipper::Middleware::Memoizer do
     end
 
     def get(uri, params = {}, env = {}, &block)
-      silence { super(uri, params, env, &block) }
+      capture_output { super(uri, params, env, &block) }
     end
 
     include_examples 'flipper middleware'
@@ -316,7 +316,7 @@ RSpec.describe Flipper::Middleware::Memoizer do
   context 'with flipper setup in env' do
     let(:app) do
       # ensure scoped for builder block, annoying...
-      instance = flipper
+      flipper
       middleware = described_class
 
       Rack::Builder.new do
@@ -460,7 +460,6 @@ RSpec.describe Flipper::Middleware::Memoizer do
       cache.clear
       cached = Flipper::Adapters::ActiveSupportCacheStore.new(logged_memory, cache)
       logged_cached = Flipper::Adapters::OperationLogger.new(cached)
-      memo = {}
       flipper = Flipper.new(logged_cached)
       flipper[:stats].enable
       flipper[:shiny].enable

data/spec/flipper/model/active_record_spec.rb

@@ -30,9 +30,20 @@ RSpec.describe Flipper::Model::ActiveRecord do
     include Flipper::Model::ActiveRecord
   end
 
+  class DelegatedUser < DelegateClass(User)
+  end
+
   class Admin < User
   end
 
+  it "doesn't warn for to_ary" do
+    # looks like we should remove this but you are wrong, we have specs that
+    # fail if there are warnings and if this regresses it will print a warning
+    # so it is in fact testing something
+    user = User.create!(name: "Test")
+    Flipper.enabled?(:something, DelegatedUser.new(user))
+  end
+
   describe "flipper_id" do
     it "returns class name and id" do
       expect(User.new(id: 1).flipper_id).to eq("User;1")

data/spec/flipper_spec.rb

@@ -313,7 +313,7 @@ RSpec.describe Flipper do
 
   describe '.group_exists' do
     it 'returns true if the group is already created' do
-      group = described_class.register('admins', &:admin?)
+      described_class.register('admins', &:admin?)
       expect(described_class.group_exists?(:admins)).to eq(true)
     end
 

data/spec/spec_helper.rb

@@ -2,12 +2,14 @@ $LOAD_PATH.unshift(File.expand_path('../../lib', __FILE__))
 
 require 'pp'
 require 'pathname'
-FlipperRoot = Pathname(__FILE__).dirname.join('..').expand_path
-
-require 'rubygems'
-require 'bundler'
+require 'bundler/setup'
 
-Bundler.setup(:default)
+require 'warning'
+Warning.ignore(/lib\/statsd/)
+Warning.ignore(/lib\/debug\//)
+Warning.ignore(/lib\/ice_age\//)
+Warning.ignore(/lib\/moneta\//)
+Warning.ignore(/lib\/mongo\//)
 
 require 'debug'
 require 'statsd'
@@ -20,6 +22,7 @@ require 'flipper/spec/shared_adapter_specs'
 require 'flipper/ui'
 require 'flipper/test_help'
 
+FlipperRoot = Pathname(__FILE__).dirname.join('..').expand_path
 Dir[FlipperRoot.join('spec/support/**/*.rb')].sort.each { |f| require f }
 
 # Disable telemetry logging in specs.
@@ -27,6 +30,9 @@ ENV["FLIPPER_CLOUD_LOGGING_ENABLED"] = "false"
 
 RSpec.configure do |config|
   config.before(:example) do
+    # default stub for telemetry
+    stub_request(:post, "https://www.flippercloud.io/adapter/telemetry").
+      to_return(status: 200, body: "", headers: {})
     Flipper::Cloud::Telemetry.reset if defined?(Flipper::Cloud::Telemetry) && Flipper::Cloud::Telemetry.respond_to?(:reset)
     Flipper::Poller.reset if defined?(Flipper::Poller)
     Flipper.unregister_groups

data/spec/support/fail_on_output.rb

@@ -1,7 +1,7 @@
 if ENV["CI"] || ENV["FAIL_ON_OUTPUT"]
   RSpec.configure do |config|
     config.around do |example|
-      output = silence { example.run }
+      output = capture_output { example.run }
       fail "Use `silence { }` to avoid printing to STDOUT/STDERR\n#{output}" unless output.empty?
     end
   end

data/spec/support/spec_helpers.rb

@@ -79,11 +79,22 @@ module SpecHelpers
     original_stdout = $stdout
 
     # Redirect stderr and stdout
-    output = $stderr = $stdout = StringIO.new
+    $stderr = $stdout = StringIO.new
+
+    yield
+  ensure
+    $stderr = original_stderr
+    $stdout = original_stdout
+  end
+
+  def capture_output
+    original_stderr = $stderr
+    original_stdout = $stdout
+
+    output = $stdout = $stderr = StringIO.new
 
     yield
 
-    # Return output
     output.string
   ensure
     $stderr = original_stderr

data/test_rails/generators/flipper/setup_generator_test.rb

@@ -17,6 +17,11 @@ class SetupGeneratorTest < Rails::Generators::TestCase
     end
   end
 
+  test "generates an initializer" do
+    run_generator
+    assert_file 'config/initializers/flipper.rb', /Flipper\.configure/
+  end
+
   test "does not invoke flipper:active_record generator if ActiveRecord adapter not defined" do
     # Ensure adapter not defined
     Flipper::Adapters.send(:remove_const, :ActiveRecord) rescue nil

data/test_rails/generators/flipper/update_generator_test.rb

@@ -65,7 +65,7 @@ class UpdateGeneratorTest < Rails::Generators::TestCase
 
     assert_migration "db/migrate/create_flipper_tables.rb" do |migration|
       assert_method :up, migration do |up|
-        assert_match /text :value/, up
+        assert_match(/text :value/, up)
       end
     end
 

data/test_rails/helper.rb

@@ -4,6 +4,9 @@ require 'minitest/autorun'
 require 'rails'
 require 'rails/test_help'
 
+require 'warning'
+Warning.ignore(/lib\/capybara\//)
+
 begin
   ActiveSupport::TestCase.test_order = :random
 rescue NoMethodError

data/test_rails/system/test_help_test.rb

@@ -6,6 +6,7 @@ return unless Rails::VERSION::MAJOR >= 7
 require "capybara/cuprite"
 require "flipper"
 require "flipper/test_help"
+require "action_controller/railtie"
 
 require 'action_dispatch/system_testing/server'
 ActionDispatch::SystemTesting::Server.silence_puma = true