Skip to content

Commit

Permalink
spec cleanup
Browse files Browse the repository at this point in the history
lean on some rspec conventions / helpers to simplify our specs.  this `.rspec` automatically loads `spec_helper.rb` before any test is run, so we no longer need to explicitly require it everywhere
  • Loading branch information
dpep committed Nov 29, 2021
1 parent 9370353 commit cf32b5e
Show file tree
Hide file tree
Showing 88 changed files with 3 additions and 143 deletions.
1 change: 1 addition & 0 deletions .rspec
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
--require spec_helper
2 changes: 0 additions & 2 deletions spec/flipper/actor_spec.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
require 'helper'

RSpec.describe Flipper::Actor do
it 'initializes with and knows flipper_id' do
actor = described_class.new("User;235")
Expand Down
2 changes: 0 additions & 2 deletions spec/flipper/adapter_spec.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
require 'helper'

RSpec.describe Flipper::Adapter do
let(:source_flipper) { build_flipper }
let(:destination_flipper) { build_flipper }
Expand Down
2 changes: 0 additions & 2 deletions spec/flipper/adapters/active_record_spec.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
require 'helper'
require 'flipper/adapters/active_record'
require 'flipper/spec/shared_adapter_specs'

# Turn off migration logging for specs
ActiveRecord::Migration.verbose = false
Expand Down
2 changes: 0 additions & 2 deletions spec/flipper/adapters/active_support_cache_store_spec.rb
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
require 'helper'
require 'active_support/cache'
require 'active_support/cache/dalli_store'
require 'flipper/adapters/operation_logger'
require 'flipper/adapters/active_support_cache_store'
require 'flipper/spec/shared_adapter_specs'

RSpec.describe Flipper::Adapters::ActiveSupportCacheStore do
let(:memory_adapter) do
Expand Down
2 changes: 0 additions & 2 deletions spec/flipper/adapters/dalli_spec.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
require 'helper'
require 'flipper/adapters/operation_logger'
require 'flipper/adapters/dalli'
require 'flipper/spec/shared_adapter_specs'
require 'logger'

RSpec.describe Flipper::Adapters::Dalli do
Expand Down
2 changes: 0 additions & 2 deletions spec/flipper/adapters/dual_write_spec.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
require 'helper'
require 'flipper/adapters/dual_write'
require 'flipper/adapters/operation_logger'
require 'flipper/spec/shared_adapter_specs'
require 'active_support/notifications'

RSpec.describe Flipper::Adapters::DualWrite do
Expand Down
2 changes: 0 additions & 2 deletions spec/flipper/adapters/http_spec.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
require 'helper'
require 'flipper/adapters/http'
require 'flipper/adapters/pstore'
require 'flipper/spec/shared_adapter_specs'
require 'rack/handler/webrick'

FLIPPER_SPEC_API_PORT = ENV.fetch('FLIPPER_SPEC_API_PORT', 9001).to_i
Expand Down
2 changes: 0 additions & 2 deletions spec/flipper/adapters/instrumented_spec.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
require 'helper'
require 'flipper/adapters/instrumented'
require 'flipper/instrumenters/memory'
require 'flipper/spec/shared_adapter_specs'

RSpec.describe Flipper::Adapters::Instrumented do
let(:instrumenter) { Flipper::Instrumenters::Memory.new }
Expand Down
2 changes: 0 additions & 2 deletions spec/flipper/adapters/memoizable_spec.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
require 'helper'
require 'flipper/adapters/memoizable'
require 'flipper/adapters/operation_logger'
require 'flipper/spec/shared_adapter_specs'

RSpec.describe Flipper::Adapters::Memoizable do
let(:features_key) { described_class::FeaturesKey }
Expand Down
3 changes: 0 additions & 3 deletions spec/flipper/adapters/memory_spec.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
require 'helper'
require 'flipper/spec/shared_adapter_specs'

RSpec.describe Flipper::Adapters::Memory do
let(:source) { {} }
subject { described_class.new(source) }
Expand Down
2 changes: 0 additions & 2 deletions spec/flipper/adapters/moneta_spec.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
require 'helper'
require 'flipper/adapters/moneta'
require 'flipper/spec/shared_adapter_specs'

RSpec.describe Flipper::Adapters::Moneta do
let(:moneta) { Moneta.new(:Memory) }
Expand Down
2 changes: 0 additions & 2 deletions spec/flipper/adapters/mongo_spec.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
require 'helper'
require 'flipper/adapters/mongo'
require 'flipper/spec/shared_adapter_specs'

Mongo::Logger.logger.level = Logger::INFO

Expand Down
2 changes: 0 additions & 2 deletions spec/flipper/adapters/operation_logger_spec.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
require 'helper'
require 'flipper/adapters/operation_logger'
require 'flipper/spec/shared_adapter_specs'

RSpec.describe Flipper::Adapters::OperationLogger do
let(:operations) { [] }
Expand Down
2 changes: 0 additions & 2 deletions spec/flipper/adapters/pstore_spec.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
require 'helper'
require 'flipper/adapters/pstore'
require 'flipper/spec/shared_adapter_specs'

RSpec.describe Flipper::Adapters::PStore do
subject do
Expand Down
1 change: 0 additions & 1 deletion spec/flipper/adapters/read_only_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
require 'helper'
require 'flipper/adapters/read_only'

RSpec.describe Flipper::Adapters::ReadOnly do
Expand Down
2 changes: 0 additions & 2 deletions spec/flipper/adapters/redis_cache_spec.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
require 'helper'
require 'flipper/adapters/operation_logger'
require 'flipper/adapters/redis_cache'
require 'flipper/spec/shared_adapter_specs'

RSpec.describe Flipper::Adapters::RedisCache do
let(:client) do
Expand Down
2 changes: 0 additions & 2 deletions spec/flipper/adapters/redis_spec.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
require 'helper'
require 'flipper/adapters/redis'
require 'flipper/spec/shared_adapter_specs'

RSpec.describe Flipper::Adapters::Redis do
let(:client) do
Expand Down
2 changes: 0 additions & 2 deletions spec/flipper/adapters/rollout_spec.rb
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
require 'helper'
require 'redis'
require 'rollout'
require 'flipper/adapters/rollout'
require 'flipper/spec/shared_adapter_specs'

RSpec.describe Flipper::Adapters::Rollout do
let(:redis) { Redis.new }
Expand Down
2 changes: 0 additions & 2 deletions spec/flipper/adapters/sequel_spec.rb
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
require 'helper'
require 'sequel'

Sequel::Model.db = Sequel.sqlite(':memory:')
Sequel.extension :migration, :core_extensions

require 'flipper/adapters/sequel'
require 'generators/flipper/templates/sequel_migration'
require 'flipper/spec/shared_adapter_specs'

RSpec.describe Flipper::Adapters::Sequel do
subject do
Expand Down
1 change: 0 additions & 1 deletion spec/flipper/adapters/sync/feature_synchronizer_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
require "helper"
require "flipper/adapters/memory"
require "flipper/adapters/operation_logger"
require "flipper/adapters/sync/feature_synchronizer"
Expand Down
1 change: 0 additions & 1 deletion spec/flipper/adapters/sync/interval_synchronizer_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
require "helper"
require "flipper/adapters/sync/interval_synchronizer"

RSpec.describe Flipper::Adapters::Sync::IntervalSynchronizer do
Expand Down
1 change: 0 additions & 1 deletion spec/flipper/adapters/sync/synchronizer_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
require "helper"
require "flipper/adapters/memory"
require "flipper/instrumenters/memory"
require "flipper/adapters/sync/synchronizer"
Expand Down
2 changes: 0 additions & 2 deletions spec/flipper/adapters/sync_spec.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
require 'helper'
require 'flipper/adapters/sync'
require 'flipper/adapters/operation_logger'
require 'flipper/spec/shared_adapter_specs'
require 'active_support/notifications'

RSpec.describe Flipper::Adapters::Sync do
Expand Down
2 changes: 0 additions & 2 deletions spec/flipper/api/action_spec.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
require 'helper'

RSpec.describe Flipper::Api::Action do
let(:action_subclass) do
Class.new(described_class) do
Expand Down
2 changes: 0 additions & 2 deletions spec/flipper/api/json_params_spec.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
require 'helper'

RSpec.describe Flipper::Api::JsonParams do
let(:app) do
app = lambda do |env|
Expand Down
2 changes: 0 additions & 2 deletions spec/flipper/api/v1/actions/actors_gate_spec.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
require 'helper'

RSpec.describe Flipper::Api::V1::Actions::ActorsGate do
let(:app) { build_api(flipper) }
let(:actor) { Flipper::Actor.new('1') }
Expand Down
2 changes: 0 additions & 2 deletions spec/flipper/api/v1/actions/actors_spec.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
require 'helper'

RSpec.describe Flipper::Api::V1::Actions::Actors do
let(:app) { build_api(flipper) }
let(:actor) { Flipper::Actor.new('User123') }
Expand Down
2 changes: 0 additions & 2 deletions spec/flipper/api/v1/actions/boolean_gate_spec.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
require 'helper'

RSpec.describe Flipper::Api::V1::Actions::BooleanGate do
let(:app) { build_api(flipper) }

Expand Down
2 changes: 0 additions & 2 deletions spec/flipper/api/v1/actions/clear_feature_spec.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
require 'helper'

RSpec.describe Flipper::Api::V1::Actions::ClearFeature do
let(:app) { build_api(flipper) }

Expand Down
2 changes: 0 additions & 2 deletions spec/flipper/api/v1/actions/feature_spec.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
require 'helper'

RSpec.describe Flipper::Api::V1::Actions::Feature do
let(:app) { build_api(flipper) }
let(:feature) { build_feature }
Expand Down
2 changes: 0 additions & 2 deletions spec/flipper/api/v1/actions/features_spec.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
require 'helper'

RSpec.describe Flipper::Api::V1::Actions::Features do
let(:app) { build_api(flipper) }
let(:feature) { build_feature }
Expand Down
2 changes: 0 additions & 2 deletions spec/flipper/api/v1/actions/groups_gate_spec.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
require 'helper'

RSpec.describe Flipper::Api::V1::Actions::GroupsGate do
let(:app) { build_api(flipper) }

Expand Down
2 changes: 0 additions & 2 deletions spec/flipper/api/v1/actions/percentage_of_actors_gate_spec.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
require 'helper'

RSpec.describe Flipper::Api::V1::Actions::PercentageOfActorsGate do
let(:app) { build_api(flipper) }

Expand Down
2 changes: 0 additions & 2 deletions spec/flipper/api/v1/actions/percentage_of_time_gate_spec.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
require 'helper'

RSpec.describe Flipper::Api::V1::Actions::PercentageOfTimeGate do
let(:app) { build_api(flipper) }

Expand Down
2 changes: 0 additions & 2 deletions spec/flipper/api_spec.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
require 'helper'

RSpec.describe Flipper::Api do
describe 'Initializing middleware with flipper instance' do
let(:app) { build_api(flipper) }
Expand Down
1 change: 0 additions & 1 deletion spec/flipper/cloud/configuration_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
require 'helper'
require 'flipper/cloud/configuration'
require 'flipper/adapters/instrumented'

Expand Down
1 change: 0 additions & 1 deletion spec/flipper/cloud/dsl_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
require 'helper'
require 'flipper/cloud/configuration'
require 'flipper/cloud/dsl'
require 'flipper/adapters/operation_logger'
Expand Down
1 change: 0 additions & 1 deletion spec/flipper/cloud/engine_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
require 'helper'
require 'rails'
require 'flipper/cloud'

Expand Down
1 change: 0 additions & 1 deletion spec/flipper/cloud/message_verifier_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
require 'helper'
require 'flipper/cloud/message_verifier'

RSpec.describe Flipper::Cloud::MessageVerifier do
Expand Down
1 change: 0 additions & 1 deletion spec/flipper/cloud/middleware_spec.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
require 'securerandom'
require 'helper'
require 'flipper/cloud'
require 'flipper/cloud/middleware'
require 'flipper/adapters/operation_logger'
Expand Down
1 change: 0 additions & 1 deletion spec/flipper/cloud_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
require 'helper'
require 'flipper/cloud'
require 'flipper/adapters/instrumented'
require 'flipper/instrumenters/memory'
Expand Down
1 change: 0 additions & 1 deletion spec/flipper/configuration_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
require 'helper'
require 'flipper/configuration'

RSpec.describe Flipper::Configuration do
Expand Down
1 change: 0 additions & 1 deletion spec/flipper/dsl_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
require 'helper'
require 'flipper/dsl'

RSpec.describe Flipper::DSL do
Expand Down
2 changes: 0 additions & 2 deletions spec/flipper/feature_check_context_spec.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
require 'helper'

RSpec.describe Flipper::FeatureCheckContext do
let(:feature_name) { :new_profiles }
let(:values) { Flipper::GateValues.new({}) }
Expand Down
1 change: 0 additions & 1 deletion spec/flipper/feature_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
require 'helper'
require 'flipper/feature'
require 'flipper/instrumenters/memory'

Expand Down
2 changes: 0 additions & 2 deletions spec/flipper/gate_spec.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
require 'helper'

RSpec.describe Flipper::Gate do
let(:feature_name) { :stats }

Expand Down
1 change: 0 additions & 1 deletion spec/flipper/gate_values_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
require 'helper'
require 'flipper/gate_values'

RSpec.describe Flipper::GateValues do
Expand Down
2 changes: 0 additions & 2 deletions spec/flipper/gates/actor_spec.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
require 'helper'

RSpec.describe Flipper::Gates::Actor do
let(:feature_name) { :search }

Expand Down
2 changes: 0 additions & 2 deletions spec/flipper/gates/boolean_spec.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
require 'helper'

RSpec.describe Flipper::Gates::Boolean do
let(:feature_name) { :search }

Expand Down
2 changes: 0 additions & 2 deletions spec/flipper/gates/group_spec.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
require 'helper'

RSpec.describe Flipper::Gates::Group do
let(:feature_name) { :search }

Expand Down
2 changes: 0 additions & 2 deletions spec/flipper/gates/percentage_of_actors_spec.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
require 'helper'

RSpec.describe Flipper::Gates::PercentageOfActors do
let(:feature_name) { :search }

Expand Down
2 changes: 0 additions & 2 deletions spec/flipper/gates/percentage_of_time_spec.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
require 'helper'

RSpec.describe Flipper::Gates::PercentageOfTime do
let(:feature_name) { :search }

Expand Down
1 change: 0 additions & 1 deletion spec/flipper/identifier_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
require 'helper'
require 'flipper/identifier'

RSpec.describe Flipper::Identifier do
Expand Down
1 change: 0 additions & 1 deletion spec/flipper/instrumentation/log_subscriber_spec.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
require 'logger'
require 'helper'
require 'flipper/adapters/instrumented'
require 'flipper/instrumentation/log_subscriber'

Expand Down
1 change: 0 additions & 1 deletion spec/flipper/instrumentation/statsd_subscriber_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
require 'helper'
require 'flipper/adapters/instrumented'
require 'flipper/instrumentation/statsd'
require 'statsd'
Expand Down
1 change: 0 additions & 1 deletion spec/flipper/instrumenters/memory_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
require 'helper'
require 'flipper/instrumenters/memory'

RSpec.describe Flipper::Instrumenters::Memory do
Expand Down
2 changes: 0 additions & 2 deletions spec/flipper/instrumenters/noop_spec.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
require 'helper'

RSpec.describe Flipper::Instrumenters::Noop do
describe '.instrument' do
context 'with name' do
Expand Down
2 changes: 0 additions & 2 deletions spec/flipper/middleware/memoizer_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
require 'helper'
require 'rack/test'
require 'active_support/cache'
require 'active_support/cache/dalli_store'
Expand Down Expand Up @@ -362,7 +361,6 @@ def get(uri, params = {}, env = {}, &block)
end.to_app
end


context 'and unless option' do
before do
options[:unless] = ->(request) { request.path.start_with?("/assets") }
Expand Down
2 changes: 0 additions & 2 deletions spec/flipper/middleware/setup_env_spec.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
require 'helper'

RSpec.describe Flipper::Middleware::SetupEnv do
context 'with flipper instance' do
let(:app) do
Expand Down
1 change: 0 additions & 1 deletion spec/flipper/railtie_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
require 'helper'
require 'rails'
require 'flipper/railtie'

Expand Down
1 change: 0 additions & 1 deletion spec/flipper/registry_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
require 'helper'
require 'flipper/registry'

RSpec.describe Flipper::Registry do
Expand Down
1 change: 0 additions & 1 deletion spec/flipper/typecast_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
require 'helper'
require 'flipper/typecast'

RSpec.describe Flipper::Typecast do
Expand Down
Loading

0 comments on commit cf32b5e

Please sign in to comment.