flipper 1.1.2 → 1.3.0

data/spec/flipper/cli_spec.rb

@@ -0,0 +1,164 @@
+require "flipper/cli"
+
+RSpec.describe Flipper::CLI do
+  let(:stdout) { StringIO.new }
+  let(:stderr) { StringIO.new }
+  let(:cli) { Flipper::CLI.new(stdout: stdout, stderr: stderr) }
+
+  before do
+    # Prentend stdout/stderr a TTY to test colorization
+    allow(stdout).to receive(:tty?).and_return(true)
+    allow(stderr).to receive(:tty?).and_return(true)
+  end
+
+  # Infer the command from the description
+  subject(: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
+
+  subject do
+    status = 0
+
+    begin
+      cli.run(argv)
+    rescue SystemExit => e
+      status = e.status
+    end
+
+    OpenStruct.new(status: status, stdout: stdout.string, stderr: stderr.string)
+  end
+
+  before do
+    ENV["FLIPPER_REQUIRE"] = "./spec/fixtures/environment"
+  end
+
+  describe "enable" do
+    describe "feature" do
+      it do
+        expect(subject).to have_attributes(status: 0, stdout: /feature.*\e\[32m.*enabled/)
+        expect(Flipper).to be_enabled(:feature)
+      end
+    end
+
+    describe "-a User;1 feature" do
+      it do
+        expect(subject).to have_attributes(status: 0, stdout: /feature.*\e\[33m.*enabled.*User;1/m)
+        expect(Flipper).to be_enabled(:feature, Flipper::Actor.new("User;1"))
+      end
+    end
+
+    describe "feature -g admins" do
+      it do
+        expect(subject).to have_attributes(status: 0, stdout: /feature.*enabled.*admins/m)
+        expect(Flipper.feature('feature').enabled_groups.map(&:name)).to eq([:admins])
+      end
+    end
+
+    describe "feature -p 30" do
+      it do
+        expect(subject).to have_attributes(status: 0, stdout: /feature.*enabled.*30% of actors/m)
+        expect(Flipper.feature('feature').percentage_of_actors_value).to eq(30)
+      end
+    end
+
+    describe "feature -t 50" do
+      it do
+        expect(subject).to have_attributes(status: 0, stdout: /feature.*enabled.*50% of time/m)
+        expect(Flipper.feature('feature').percentage_of_time_value).to eq(50)
+      end
+    end
+
+    describe %|feature -x '{"Equal":[{"Property":"flipper_id"},"User;1"]}'| do
+      it do
+        expect(subject).to have_attributes(status: 0, stdout: /feature.*enabled.*User;1/m)
+        expect(Flipper.feature('feature').expression.value).to eq({ "Equal" => [ { "Property" => ["flipper_id"] }, "User;1" ] })
+      end
+    end
+
+    describe %|feature -x invalid_json| do
+      it do
+        expect(subject).to have_attributes(status: 1, stderr: /JSON parse error/m)
+      end
+    end
+
+    describe %|feature -x '{}'| do
+      it do
+        expect(subject).to have_attributes(status: 1, stderr: /Invalid expression/m)
+      end
+    end
+  end
+
+  describe "disable" do
+    describe "feature" do
+      before { Flipper.enable :feature }
+
+      it do
+        expect(subject).to have_attributes(status: 0, stdout: /feature.*disabled/)
+        expect(Flipper).not_to be_enabled(:feature)
+      end
+    end
+
+    describe "feature -g admins" do
+      before { Flipper.enable_group(:feature, :admins) }
+
+      it do
+        expect(subject).to have_attributes(status: 0, stdout: /feature.*disabled/)
+        expect(Flipper.feature('feature').enabled_groups).to be_empty
+      end
+    end
+  end
+
+  describe "list" do
+    before do
+      Flipper.enable :foo
+      Flipper.disable :bar
+    end
+
+    it "lists features" do
+      expect(subject).to have_attributes(status: 0, stdout: /foo.*enabled/)
+      expect(subject).to have_attributes(status: 0, stdout: /bar.*disabled/)
+    end
+  end
+
+  ["-h", "--help", "help"].each do |arg|
+    describe arg do
+      it { should have_attributes(status: 0, stdout: /Usage: flipper/) }
+
+      it "should list subcommands" do
+        %w(enable disable list).each do |subcommand|
+          expect(subject.stdout).to match(/#{subcommand}/)
+        end
+      end
+    end
+  end
+
+  describe "help enable" do
+    it { should have_attributes(status: 0, stdout: /Usage: flipper enable \[options\] <feature>/) }
+  end
+
+  describe "nope" do
+    it { should have_attributes(status: 1, stderr: /Unknown command: nope/) }
+  end
+
+  describe "--nope" do
+    it { should have_attributes(status: 1, stderr: /invalid option: --nope/) }
+  end
+
+  describe "show foo" do
+    context "boolean" do
+      before { Flipper.enable :foo }
+      it { should have_attributes(status: 0, stdout: /foo.*enabled/) }
+    end
+
+    context "actors" do
+      before { Flipper.enable_actor :foo, Flipper::Actor.new("User;1") }
+      it { should have_attributes(status: 0, stdout: /User;1/) }
+    end
+
+    context "groups" do
+      before { Flipper.enable_group :foo, :admins }
+      it { should have_attributes(status: 0, stdout: /enabled.*admins/m) }
+    end
+  end
+end

data/spec/flipper/cloud/configuration_spec.rb

@@ -12,16 +12,16 @@ RSpec.describe Flipper::Cloud::Configuration do
   end
 
   it "can set token from ENV var" do
-    with_env "FLIPPER_CLOUD_TOKEN" => "from_env" do
-      instance = described_class.new(required_options.reject { |k, v| k == :token })
-      expect(instance.token).to eq("from_env")
-    end
+    ENV["FLIPPER_CLOUD_TOKEN"] = "from_env"
+    instance = described_class.new(required_options.reject { |k, v| k == :token })
+    expect(instance.token).to eq("from_env")
   end
 
   it "can set instrumenter" do
     instrumenter = Object.new
     instance = described_class.new(required_options.merge(instrumenter: instrumenter))
-    expect(instance.instrumenter).to be(instrumenter)
+    expect(instance.instrumenter).to be_a(Flipper::Cloud::Telemetry::Instrumenter)
+    expect(instance.instrumenter.instrumenter).to be(instrumenter)
   end
 
   it "can set read_timeout" do
@@ -30,10 +30,9 @@ RSpec.describe Flipper::Cloud::Configuration do
   end
 
   it "can set read_timeout from ENV var" do
-    with_env "FLIPPER_CLOUD_READ_TIMEOUT" => "9" do
-      instance = described_class.new(required_options.reject { |k, v| k == :read_timeout })
-      expect(instance.read_timeout).to eq(9)
-    end
+    ENV["FLIPPER_CLOUD_READ_TIMEOUT"] = "9"
+    instance = described_class.new(required_options.reject { |k, v| k == :read_timeout })
+    expect(instance.read_timeout).to eq(9)
   end
 
   it "can set open_timeout" do
@@ -42,10 +41,9 @@ RSpec.describe Flipper::Cloud::Configuration do
   end
 
   it "can set open_timeout from ENV var" do
-    with_env "FLIPPER_CLOUD_OPEN_TIMEOUT" => "9" do
-      instance = described_class.new(required_options.reject { |k, v| k == :open_timeout })
-      expect(instance.open_timeout).to eq(9)
-    end
+    ENV["FLIPPER_CLOUD_OPEN_TIMEOUT"] = "9"
+    instance = described_class.new(required_options.reject { |k, v| k == :open_timeout })
+    expect(instance.open_timeout).to eq(9)
   end
 
   it "can set write_timeout" do
@@ -54,10 +52,9 @@ RSpec.describe Flipper::Cloud::Configuration do
   end
 
   it "can set write_timeout from ENV var" do
-    with_env "FLIPPER_CLOUD_WRITE_TIMEOUT" => "9" do
-      instance = described_class.new(required_options.reject { |k, v| k == :write_timeout })
-      expect(instance.write_timeout).to eq(9)
-    end
+    ENV["FLIPPER_CLOUD_WRITE_TIMEOUT"] = "9"
+    instance = described_class.new(required_options.reject { |k, v| k == :write_timeout })
+    expect(instance.write_timeout).to eq(9)
   end
 
   it "can set sync_interval" do
@@ -66,10 +63,9 @@ RSpec.describe Flipper::Cloud::Configuration do
   end
 
   it "can set sync_interval from ENV var" do
-    with_env "FLIPPER_CLOUD_SYNC_INTERVAL" => "15" do
-      instance = described_class.new(required_options.reject { |k, v| k == :sync_interval })
-      expect(instance.sync_interval).to eq(15)
-    end
+    ENV["FLIPPER_CLOUD_SYNC_INTERVAL"] = "15"
+    instance = described_class.new(required_options.reject { |k, v| k == :sync_interval })
+    expect(instance.sync_interval).to eq(15)
   end
 
   it "passes sync_interval into sync adapter" do
@@ -86,6 +82,12 @@ RSpec.describe Flipper::Cloud::Configuration do
     expect(instance.debug_output).to eq(STDOUT)
   end
 
+  it "defaults debug_output to STDOUT if FLIPPER_CLOUD_DEBUG_OUTPUT_STDOUT set to true" do
+    ENV["FLIPPER_CLOUD_DEBUG_OUTPUT_STDOUT"] = "true"
+    instance = described_class.new(required_options)
+    expect(instance.debug_output).to eq(STDOUT)
+  end
+
   it "defaults adapter block" do
     # The initial sync of http to local invokes this web request.
     stub_request(:get, /flippercloud\.io/).to_return(status: 200, body: "{}")
@@ -121,10 +123,9 @@ RSpec.describe Flipper::Cloud::Configuration do
   end
 
   it "can override URL using ENV var" do
-    with_env "FLIPPER_CLOUD_URL" => "https://example.com" do
-      instance = described_class.new(required_options.reject { |k, v| k == :url })
-      expect(instance.url).to eq("https://example.com")
-    end
+    ENV["FLIPPER_CLOUD_URL"] = "https://example.com"
+    instance = described_class.new(required_options.reject { |k, v| k == :url })
+    expect(instance.url).to eq("https://example.com")
   end
 
   it "defaults sync_method to :poll" do
@@ -143,12 +144,11 @@ RSpec.describe Flipper::Cloud::Configuration do
   end
 
   it "sets sync_method to :webhook if FLIPPER_CLOUD_SYNC_SECRET set" do
-    with_env "FLIPPER_CLOUD_SYNC_SECRET" => "abc" do
-      instance = described_class.new(required_options)
+    ENV["FLIPPER_CLOUD_SYNC_SECRET"] = "abc"
+    instance = described_class.new(required_options)
 
-      expect(instance.sync_method).to eq(:webhook)
-      expect(instance.adapter).to be_instance_of(Flipper::Adapters::DualWrite)
-    end
+    expect(instance.sync_method).to eq(:webhook)
+    expect(instance.adapter).to be_instance_of(Flipper::Adapters::DualWrite)
   end
 
   it "can set sync_secret" do
@@ -157,10 +157,9 @@ RSpec.describe Flipper::Cloud::Configuration do
   end
 
   it "can override sync_secret using ENV var" do
-    with_env "FLIPPER_CLOUD_SYNC_SECRET" => "from_env" do
-      instance = described_class.new(required_options.reject { |k, v| k == :sync_secret })
-      expect(instance.sync_secret).to eq("from_env")
-    end
+    ENV["FLIPPER_CLOUD_SYNC_SECRET"] = "from_env"
+    instance = described_class.new(required_options.reject { |k, v| k == :sync_secret })
+    expect(instance.sync_secret).to eq("from_env")
   end
 
   it "can sync with cloud" do
@@ -233,9 +232,9 @@ RSpec.describe Flipper::Cloud::Configuration do
     stub = stub_request(:get, "https://www.flippercloud.io/adapter/features?exclude_gate_names=true").
       with({
         headers: {
-          'Flipper-Cloud-Token'=>'asdf',
+          'flipper-cloud-token'=>'asdf',
         },
-      }).to_return(status: 200, body: body, headers: {})
+      }).to_return(status: 200, body: body)
     instance = described_class.new(required_options)
     instance.sync
 

data/spec/flipper/cloud/dsl_spec.rb

@@ -18,7 +18,7 @@ RSpec.describe Flipper::Cloud::DSL do
     stub = stub_request(:get, "https://www.flippercloud.io/adapter/features?exclude_gate_names=true").
       with({
         headers: {
-          'Flipper-Cloud-Token'=>'asdf',
+          'flipper-cloud-token'=>'asdf',
         },
       }).to_return(status: 200, body: '{"features": {}}', headers: {})
     cloud_configuration = Flipper::Cloud::Configuration.new({
@@ -65,11 +65,11 @@ RSpec.describe Flipper::Cloud::DSL do
 
     it "sends writes to cloud and local" do
       add_stub = stub_request(:post, "https://www.flippercloud.io/adapter/features").
-        with({headers: {'Flipper-Cloud-Token'=>'asdf'}}).
-        to_return(status: 200, body: '{}', headers: {})
+        with({headers: {'flipper-cloud-token'=>'asdf'}}).
+        to_return(status: 200, body: '{}')
       enable_stub = stub_request(:post, "https://www.flippercloud.io/adapter/features/foo/boolean").
-        with(headers: {'Flipper-Cloud-Token'=>'asdf'}).
-        to_return(status: 200, body: '{}', headers: {})
+        with(headers: {'flipper-cloud-token'=>'asdf'}).
+        to_return(status: 200, body: '{}')
 
       subject.enable(:foo)
 

data/spec/flipper/cloud/middleware_spec.rb

@@ -101,8 +101,8 @@ RSpec.describe Flipper::Cloud::Middleware do
       post '/', request_body, env
 
       expect(last_response.status).to eq(402)
-      expect(last_response.headers["Flipper-Cloud-Response-Error-Class"]).to eq("Flipper::Adapters::Http::Error")
-      expect(last_response.headers["Flipper-Cloud-Response-Error-Message"]).to include("Failed with status: 402")
+      expect(last_response.headers["flipper-cloud-response-error-class"]).to eq("Flipper::Adapters::Http::Error")
+      expect(last_response.headers["flipper-cloud-response-error-message"]).to include("Failed with status: 402")
       expect(stub).to have_been_requested
     end
   end
@@ -124,8 +124,8 @@ RSpec.describe Flipper::Cloud::Middleware do
       post '/', request_body, env
 
       expect(last_response.status).to eq(500)
-      expect(last_response.headers["Flipper-Cloud-Response-Error-Class"]).to eq("Flipper::Adapters::Http::Error")
-      expect(last_response.headers["Flipper-Cloud-Response-Error-Message"]).to include("Failed with status: 503")
+      expect(last_response.headers["flipper-cloud-response-error-class"]).to eq("Flipper::Adapters::Http::Error")
+      expect(last_response.headers["flipper-cloud-response-error-message"]).to include("Failed with status: 503")
       expect(stub).to have_been_requested
     end
   end
@@ -147,8 +147,8 @@ RSpec.describe Flipper::Cloud::Middleware do
       post '/', request_body, env
 
       expect(last_response.status).to eq(500)
-      expect(last_response.headers["Flipper-Cloud-Response-Error-Class"]).to eq("Net::OpenTimeout")
-      expect(last_response.headers["Flipper-Cloud-Response-Error-Message"]).to eq("execution expired")
+      expect(last_response.headers["flipper-cloud-response-error-class"]).to eq("Net::OpenTimeout")
+      expect(last_response.headers["flipper-cloud-response-error-message"]).to eq("execution expired")
       expect(stub).to have_been_requested
     end
   end
@@ -277,13 +277,13 @@ RSpec.describe Flipper::Cloud::Middleware do
     stub = stub_request(:get, "https://www.flippercloud.io/adapter/features?exclude_gate_names=true").
       with({
         headers: {
-          'Flipper-Cloud-Token' => token,
+          'flipper-cloud-token' => token,
         },
       })
     if status == :timeout
       stub.to_timeout
     else
-      stub.to_return(status: status, body: response_body, headers: {})
+      stub.to_return(status: status, body: response_body)
     end
   end
 end

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

@@ -49,19 +49,18 @@ RSpec.describe Flipper::Cloud::Telemetry::BackoffPolicy do
     end
 
     it "from env" do
-      env = {
+      ENV.update(
         "FLIPPER_BACKOFF_MIN_TIMEOUT_MS" => "1000",
         "FLIPPER_BACKOFF_MAX_TIMEOUT_MS" => "2000",
         "FLIPPER_BACKOFF_MULTIPLIER" => "1.9",
         "FLIPPER_BACKOFF_RANDOMIZATION_FACTOR" => "0.1",
-      }
-      with_env env do
-        policy = described_class.new
-        expect(policy.min_timeout_ms).to eq(1000)
-        expect(policy.max_timeout_ms).to eq(2000)
-        expect(policy.multiplier).to eq(1.9)
-        expect(policy.randomization_factor).to eq(0.1)
-      end
+      )
+
+      policy = described_class.new
+      expect(policy.min_timeout_ms).to eq(1000)
+      expect(policy.max_timeout_ms).to eq(2000)
+      expect(policy.multiplier).to eq(1.9)
+      expect(policy.randomization_factor).to eq(0.1)
     end
   end
 

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

@@ -43,33 +43,33 @@ RSpec.describe Flipper::Cloud::Telemetry::Submitter do
         ]
       }
       expected_headers = {
-        'Accept' => 'application/json',
-        'Client-Engine' => defined?(RUBY_ENGINE) ? RUBY_ENGINE : "",
-        'Client-Hostname' => Socket.gethostname,
-        'Client-Language' => 'ruby',
-        'Client-Language-Version' => "#{RUBY_VERSION} p#{RUBY_PATCHLEVEL} (#{RUBY_RELEASE_DATE})",
-        'Client-Pid' => Process.pid.to_s,
-        'Client-Platform' => RUBY_PLATFORM,
-        'Client-Thread' => Thread.current.object_id.to_s,
-        'Content-Encoding' => 'gzip',
-        'Content-Type' => 'application/json',
-        'Flipper-Cloud-Token' => 'asdf',
-        'Schema-Version' => 'V1',
-        'User-Agent' => "Flipper HTTP Adapter v#{Flipper::VERSION}",
+        'accept' => 'application/json',
+        'client-engine' => defined?(RUBY_ENGINE) ? RUBY_ENGINE : "",
+        'client-hostname' => Socket.gethostname,
+        'client-language' => 'ruby',
+        'client-language-version' => "#{RUBY_VERSION} p#{RUBY_PATCHLEVEL} (#{RUBY_RELEASE_DATE})",
+        'client-pid' => Process.pid.to_s,
+        'client-platform' => RUBY_PLATFORM,
+        'client-thread' => Thread.current.object_id.to_s,
+        'content-encoding' => 'gzip',
+        'content-type' => 'application/json',
+        'flipper-cloud-token' => 'asdf',
+        'schema-version' => 'V1',
+        'user-agent' => "Flipper HTTP Adapter v#{Flipper::VERSION}",
       }
       stub_request(:post, "https://www.flippercloud.io/adapter/telemetry").
         with(headers: expected_headers) { |request|
           gunzipped = Flipper::Typecast.from_gzip(request.body)
           body = Flipper::Typecast.from_json(gunzipped)
           body == expected_body
-        }.to_return(status: 200, body: "{}", headers: {})
+        }.to_return(status: 200, body: "{}")
       subject.call(enabled_metrics)
     end
 
     it "defaults backoff_policy" do
       stub_request(:post, "https://www.flippercloud.io/adapter/telemetry").
-        to_return(status: 429, body: "{}", headers: {}).
-        to_return(status: 200, body: "{}", headers: {})
+        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)
@@ -77,7 +77,7 @@ RSpec.describe Flipper::Cloud::Telemetry::Submitter do
 
     it "tries 10 times by default" do
       stub_request(:post, "https://www.flippercloud.io/adapter/telemetry").
-        to_return(status: 500, body: "{}", headers: {})
+        to_return(status: 500, body: "{}")
       subject.call(enabled_metrics)
       expect(subject.backoff_policy.retries).to eq(9) # 9 retries + 1 initial attempt
     end
@@ -111,19 +111,19 @@ RSpec.describe Flipper::Cloud::Telemetry::Submitter do
 
     it "retries on 429" do
       stub_request(:post, "https://www.flippercloud.io/adapter/telemetry").
-        to_return(status: 429, body: "{}", headers: {}).
-        to_return(status: 429, body: "{}", headers: {}).
-        to_return(status: 200, body: "{}", headers: {})
+        to_return(status: 429, body: "{}").
+        to_return(status: 429, body: "{}").
+        to_return(status: 200, body: "{}")
       subject.call(enabled_metrics)
       expect(subject.backoff_policy.retries).to eq(2)
     end
 
     it "retries on 500" do
       stub_request(:post, "https://www.flippercloud.io/adapter/telemetry").
-        to_return(status: 500, body: "{}", headers: {}).
-        to_return(status: 503, body: "{}", headers: {}).
-        to_return(status: 502, body: "{}", headers: {}).
-        to_return(status: 200, body: "{}", headers: {})
+        to_return(status: 500, body: "{}").
+        to_return(status: 503, body: "{}").
+        to_return(status: 502, body: "{}").
+        to_return(status: 200, body: "{}")
       subject.call(enabled_metrics)
       expect(subject.backoff_policy.retries).to eq(3)
     end

data/spec/flipper/cloud/telemetry_spec.rb

@@ -2,9 +2,15 @@ require 'flipper/cloud/telemetry'
 require 'flipper/cloud/configuration'
 
 RSpec.describe Flipper::Cloud::Telemetry do
+  before do
+    # Stub polling for features.
+    stub_request(:get, "https://www.flippercloud.io/adapter/features?exclude_gate_names=true").
+      to_return(status: 200, body: "{}")
+  end
+
   it "phones home and does not update telemetry interval if missing" do
     stub = stub_request(:post, "https://www.flippercloud.io/adapter/telemetry").
-      to_return(status: 200, body: "{}", headers: {})
+      to_return(status: 200, body: "{}")
 
     cloud_configuration = Flipper::Cloud::Configuration.new(token: "test")
 
@@ -42,6 +48,52 @@ RSpec.describe Flipper::Cloud::Telemetry do
     expect(stub).to have_been_requested
   end
 
+  it "phones home and requests shutdown if telemetry-shutdown header is true" do
+    stub = stub_request(:post, "https://www.flippercloud.io/adapter/telemetry").
+      to_return(status: 404, body: "{}", headers: {"telemetry-shutdown" => "true"})
+
+    output = StringIO.new
+    cloud_configuration = Flipper::Cloud::Configuration.new(
+      token: "test",
+      logger: Logger.new(output),
+      logging_enabled: true,
+    )
+
+    # Record some telemetry and stop the threads so we submit a response.
+    telemetry = described_class.new(cloud_configuration)
+    telemetry.record(Flipper::Feature::InstrumentationName, {
+      operation: :enabled?,
+      feature_name: :foo,
+      result: true,
+    })
+    telemetry.stop
+    expect(stub).to have_been_requested
+    expect(output.string).to match(/action=telemetry_shutdown message=The server has requested that telemetry be shut down./)
+  end
+
+  it "phones home and does not shutdown if telemetry shutdown header is missing" do
+    stub = stub_request(:post, "https://www.flippercloud.io/adapter/telemetry").
+      to_return(status: 404, body: "{}", headers: {})
+
+    output = StringIO.new
+    cloud_configuration = Flipper::Cloud::Configuration.new(
+      token: "test",
+      logger: Logger.new(output),
+      logging_enabled: true,
+    )
+
+    # Record some telemetry and stop the threads so we submit a response.
+    telemetry = described_class.new(cloud_configuration)
+    telemetry.record(Flipper::Feature::InstrumentationName, {
+      operation: :enabled?,
+      feature_name: :foo,
+      result: true,
+    })
+    telemetry.stop
+    expect(stub).to have_been_requested
+    expect(output.string).not_to match(/action=telemetry_shutdown message=The server has requested that telemetry be shut down./)
+  end
+
   it "can update telemetry interval from error" do
     stub = stub_request(:post, "https://www.flippercloud.io/adapter/telemetry").
       to_return(status: 500, body: "{}", headers: {"telemetry-interval" => "120"})

data/spec/flipper/cloud_spec.rb

@@ -35,8 +35,9 @@ RSpec.describe Flipper::Cloud do
       expect(client.uri.scheme).to eq('https')
       expect(client.uri.host).to eq('www.flippercloud.io')
       expect(client.uri.path).to eq('/adapter')
-      expect(client.headers['Flipper-Cloud-Token']).to eq(token)
-      expect(@instance.instrumenter).to be(Flipper::Instrumenters::Noop)
+      expect(client.headers["flipper-cloud-token"]).to eq(token)
+      expect(@instance.instrumenter).to be_a(Flipper::Cloud::Telemetry::Instrumenter)
+      expect(@instance.instrumenter.instrumenter).to be(Flipper::Instrumenters::Noop)
     end
   end
 
@@ -55,15 +56,15 @@ RSpec.describe Flipper::Cloud do
   end
 
   it 'can initialize with no token explicitly provided' do
-    with_env 'FLIPPER_CLOUD_TOKEN' => 'asdf' do
-      expect(described_class.new).to be_instance_of(Flipper::Cloud::DSL)
-    end
+    ENV['FLIPPER_CLOUD_TOKEN'] = 'asdf'
+    expect(described_class.new).to be_instance_of(Flipper::Cloud::DSL)
   end
 
   it 'can set instrumenter' do
     instrumenter = Flipper::Instrumenters::Memory.new
     instance = described_class.new(token: 'asdf', instrumenter: instrumenter)
-    expect(instance.instrumenter).to be(instrumenter)
+    expect(instance.instrumenter).to be_a(Flipper::Cloud::Telemetry::Instrumenter)
+    expect(instance.instrumenter.instrumenter).to be(instrumenter)
   end
 
   it 'allows wrapping adapter with another adapter like the instrumenter' do
@@ -104,7 +105,7 @@ RSpec.describe Flipper::Cloud do
 
   it 'can import' do
     stub_request(:post, /www\.flippercloud\.io\/adapter\/features.*/).
-      with(headers: {'Flipper-Cloud-Token'=>'asdf'}).to_return(status: 200, body: "{}", headers: {})
+      with(headers: {'flipper-cloud-token'=>'asdf'}).to_return(status: 200, body: "{}", headers: {})
 
     flipper = Flipper.new(Flipper::Adapters::Memory.new)
 
@@ -130,7 +131,7 @@ RSpec.describe Flipper::Cloud do
 
   it 'raises error for failure while importing' do
     stub_request(:post, /www\.flippercloud\.io\/adapter\/features.*/).
-      with(headers: {'Flipper-Cloud-Token'=>'asdf'}).to_return(status: 500, body: "{}")
+      with(headers: {'flipper-cloud-token'=>'asdf'}).to_return(status: 500, body: "{}")
 
     flipper = Flipper.new(Flipper::Adapters::Memory.new)
 
@@ -155,7 +156,7 @@ RSpec.describe Flipper::Cloud do
 
   it 'raises error for timeout while importing' do
     stub_request(:post, /www\.flippercloud\.io\/adapter\/features.*/).
-      with(headers: {'Flipper-Cloud-Token'=>'asdf'}).to_timeout
+      with(headers: {'flipper-cloud-token'=>'asdf'}).to_timeout
 
     flipper = Flipper.new(Flipper::Adapters::Memory.new)