flipper 0.7.1 → 0.7.2

data/spec/flipper/gate_spec.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-describe Flipper::Gate do
+RSpec.describe Flipper::Gate do
   let(:feature_name) { :stats }
 
   subject {
@@ -31,10 +31,10 @@ describe Flipper::Gate do
 
       it "includes attributes" do
         string = subject.inspect
-        string.should include(subject.object_id.to_s)
-        string.should include('name=:name')
-        string.should include('key=:key')
-        string.should include('data_type=:set')
+        expect(string).to include(subject.object_id.to_s)
+        expect(string).to include('name=:name')
+        expect(string).to include('key=:key')
+        expect(string).to include('data_type=:set')
       end
     end
   end

data/spec/flipper/gate_values_spec.rb

@@ -1,7 +1,7 @@
 require 'helper'
 require 'flipper/gate_values'
 
-describe Flipper::GateValues do
+RSpec.describe Flipper::GateValues do
   {
     nil => false,
     "" => false,
@@ -16,7 +16,7 @@ describe Flipper::GateValues do
   }.each do |value, expected|
     context "with #{value.inspect} boolean" do
       it "returns #{expected}" do
-        described_class.new(boolean: value).boolean.should be(expected)
+        expect(described_class.new(boolean: value).boolean).to be(expected)
       end
     end
   end
@@ -31,7 +31,7 @@ describe Flipper::GateValues do
   }.each do |value, expected|
     context "with #{value.inspect} percentage of time" do
       it "returns #{expected}" do
-        described_class.new(percentage_of_time: value).percentage_of_time.should be(expected)
+        expect(described_class.new(percentage_of_time: value).percentage_of_time).to be(expected)
       end
     end
   end
@@ -46,7 +46,7 @@ describe Flipper::GateValues do
   }.each do |value, expected|
     context "with #{value.inspect} percentage of actors" do
       it "returns #{expected}" do
-        described_class.new(percentage_of_actors: value).percentage_of_actors.should be(expected)
+        expect(described_class.new(percentage_of_actors: value).percentage_of_actors).to be(expected)
       end
     end
   end
@@ -59,7 +59,7 @@ describe Flipper::GateValues do
   }.each do |value, expected|
     context "with #{value.inspect} actors" do
       it "returns #{expected}" do
-        described_class.new(actors: value).actors.should eq(expected)
+        expect(described_class.new(actors: value).actors).to eq(expected)
       end
     end
   end
@@ -72,7 +72,7 @@ describe Flipper::GateValues do
   }.each do |value, expected|
     context "with #{value.inspect} groups" do
       it "returns #{expected}" do
-        described_class.new(groups: value).groups.should eq(expected)
+        expect(described_class.new(groups: value).groups).to eq(expected)
       end
     end
   end
@@ -103,32 +103,32 @@ describe Flipper::GateValues do
 
   describe "#[]" do
     it "can read the boolean value" do
-      described_class.new(boolean: true)[:boolean].should be(true)
-      described_class.new(boolean: true)["boolean"].should be(true)
+      expect(described_class.new(boolean: true)[:boolean]).to be(true)
+      expect(described_class.new(boolean: true)["boolean"]).to be(true)
     end
 
     it "can read the actors value" do
-      described_class.new(actors: Set[1, 2])[:actors].should eq(Set[1, 2])
-      described_class.new(actors: Set[1, 2])["actors"].should eq(Set[1, 2])
+      expect(described_class.new(actors: Set[1, 2])[:actors]).to eq(Set[1, 2])
+      expect(described_class.new(actors: Set[1, 2])["actors"]).to eq(Set[1, 2])
     end
 
     it "can read the groups value" do
-      described_class.new(groups: Set[:admins])[:groups].should eq(Set[:admins])
-      described_class.new(groups: Set[:admins])["groups"].should eq(Set[:admins])
+      expect(described_class.new(groups: Set[:admins])[:groups]).to eq(Set[:admins])
+      expect(described_class.new(groups: Set[:admins])["groups"]).to eq(Set[:admins])
     end
 
     it "can read the percentage of time value" do
-      described_class.new(percentage_of_time: 15)[:percentage_of_time].should eq(15)
-      described_class.new(percentage_of_time: 15)["percentage_of_time"].should eq(15)
+      expect(described_class.new(percentage_of_time: 15)[:percentage_of_time]).to eq(15)
+      expect(described_class.new(percentage_of_time: 15)["percentage_of_time"]).to eq(15)
     end
 
     it "can read the percentage of actors value" do
-      described_class.new(percentage_of_actors: 15)[:percentage_of_actors].should eq(15)
-      described_class.new(percentage_of_actors: 15)["percentage_of_actors"].should eq(15)
+      expect(described_class.new(percentage_of_actors: 15)[:percentage_of_actors]).to eq(15)
+      expect(described_class.new(percentage_of_actors: 15)["percentage_of_actors"]).to eq(15)
     end
 
     it "returns nil for value that is not present" do
-      described_class.new({})["not legit"].should be(nil)
+      expect(described_class.new({})["not legit"]).to be(nil)
     end
   end
 end

data/spec/flipper/gates/actor_spec.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-describe Flipper::Gates::Actor do
+RSpec.describe Flipper::Gates::Actor do
   let(:feature_name) { :search }
 
   subject {

data/spec/flipper/gates/boolean_spec.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-describe Flipper::Gates::Boolean do
+RSpec.describe Flipper::Gates::Boolean do
   let(:feature_name) { :search }
 
   subject {
@@ -10,13 +10,13 @@ describe Flipper::Gates::Boolean do
   describe "#enabled?" do
     context "for true value" do
       it "returns true" do
-        subject.enabled?(true).should eq(true)
+        expect(subject.enabled?(true)).to eq(true)
       end
     end
 
     context "for false value" do
       it "returns false" do
-        subject.enabled?(false).should eq(false)
+        expect(subject.enabled?(false)).to eq(false)
       end
     end
   end
@@ -24,44 +24,44 @@ describe Flipper::Gates::Boolean do
   describe "#open?" do
     context "for true value" do
       it "returns true" do
-        subject.open?(Object.new, true, feature_name: feature_name).should eq(true)
+        expect(subject.open?(Object.new, true, feature_name: feature_name)).to eq(true)
       end
     end
 
     context "for false value" do
       it "returns false" do
-        subject.open?(Object.new, false, feature_name: feature_name).should eq(false)
+        expect(subject.open?(Object.new, false, feature_name: feature_name)).to eq(false)
       end
     end
   end
 
   describe "#protects?" do
     it "returns true for boolean type" do
-      subject.protects?(Flipper::Types::Boolean.new(true)).should be(true)
+      expect(subject.protects?(Flipper::Types::Boolean.new(true))).to be(true)
     end
 
     it "returns true for true" do
-      subject.protects?(true).should be(true)
+      expect(subject.protects?(true)).to be(true)
     end
 
     it "returns true for false" do
-      subject.protects?(false).should be(true)
+      expect(subject.protects?(false)).to be(true)
     end
   end
 
   describe "#wrap" do
     it "returns boolean type for boolean type" do
-      subject.wrap(Flipper::Types::Boolean.new(true)).should be_instance_of(Flipper::Types::Boolean)
+      expect(subject.wrap(Flipper::Types::Boolean.new(true))).to be_instance_of(Flipper::Types::Boolean)
     end
 
     it "returns boolean type for true" do
-      subject.wrap(true).should be_instance_of(Flipper::Types::Boolean)
-      subject.wrap(true).value.should be(true)
+      expect(subject.wrap(true)).to be_instance_of(Flipper::Types::Boolean)
+      expect(subject.wrap(true).value).to be(true)
     end
 
     it "returns boolean type for true" do
-      subject.wrap(false).should be_instance_of(Flipper::Types::Boolean)
-      subject.wrap(false).value.should be(false)
+      expect(subject.wrap(false)).to be_instance_of(Flipper::Types::Boolean)
+      expect(subject.wrap(false).value).to be(false)
     end
   end
 end

data/spec/flipper/gates/group_spec.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-describe Flipper::Gates::Group do
+RSpec.describe Flipper::Gates::Group do
   let(:feature_name) { :search }
 
   subject {
@@ -15,7 +15,7 @@ describe Flipper::Gates::Group do
 
       it "ignores group" do
         thing = Struct.new(:flipper_id).new('5')
-        subject.open?(thing, Set[:newbs, :staff], feature_name: feature_name).should eq(true)
+        expect(subject.open?(thing, Set[:newbs, :staff], feature_name: feature_name)).to eq(true)
       end
     end
 
@@ -35,23 +35,23 @@ describe Flipper::Gates::Group do
   describe "#wrap" do
     it "returns group instance for symbol" do
       group = Flipper.register(:admins) {}
-      subject.wrap(:admins).should eq(group)
+      expect(subject.wrap(:admins)).to eq(group)
     end
 
     it "returns group instance for group instance" do
       group = Flipper.register(:admins) {}
-      subject.wrap(group).should eq(group)
+      expect(subject.wrap(group)).to eq(group)
     end
   end
 
   describe "#protects?" do
     it "returns true for group" do
       group = Flipper.register(:admins) {}
-      subject.protects?(group).should be(true)
+      expect(subject.protects?(group)).to be(true)
     end
 
     it "returns true for symbol" do
-      subject.protects?(:admins).should be(true)
+      expect(subject.protects?(:admins)).to be(true)
     end
   end
 end

data/spec/flipper/gates/percentage_of_actors_spec.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-describe Flipper::Gates::PercentageOfActors do
+RSpec.describe Flipper::Gates::PercentageOfActors do
   let(:feature_name) { :search }
 
   subject {
@@ -28,7 +28,7 @@ describe Flipper::Gates::PercentageOfActors do
       end
 
       it "does not enable both features for same set of actors" do
-        feature_one_enabled_actors.should_not eq(feature_two_enabled_actors)
+        expect(feature_one_enabled_actors).not_to eq(feature_two_enabled_actors)
       end
 
       it "enables feature for accurate number of actors for each feature" do
@@ -39,7 +39,7 @@ describe Flipper::Gates::PercentageOfActors do
           feature_one_enabled_actors.size,
           feature_two_enabled_actors.size,
         ].each do |actual_enabled_size|
-          actual_enabled_size.should be_within(margin_of_error).of(expected_enabled_size)
+          expect(actual_enabled_size).to be_within(margin_of_error).of(expected_enabled_size)
         end
       end
     end

data/spec/flipper/gates/percentage_of_time_spec.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-describe Flipper::Gates::PercentageOfTime do
+RSpec.describe Flipper::Gates::PercentageOfTime do
   let(:feature_name) { :search }
 
   subject {

data/spec/flipper/instrumentation/log_subscriber_spec.rb

@@ -3,7 +3,7 @@ require 'helper'
 require 'flipper/adapters/memory'
 require 'flipper/instrumentation/log_subscriber'
 
-describe Flipper::Instrumentation::LogSubscriber do
+RSpec.describe Flipper::Instrumentation::LogSubscriber do
   let(:adapter) { Flipper::Adapters::Memory.new }
   let(:flipper) {
     Flipper.new(adapter, :instrumenter => ActiveSupport::Notifications)
@@ -34,18 +34,18 @@ describe Flipper::Instrumentation::LogSubscriber do
 
     it "logs feature calls with result after operation" do
       feature_line = find_line('Flipper feature(search) enabled? false')
-      feature_line.should include('[ thing=nil ]')
+      expect(feature_line).to include('[ thing=nil ]')
     end
 
     it "logs adapter calls" do
       adapter_line = find_line('Flipper feature(search) adapter(memory) get')
-      adapter_line.should include('[ result={')
-      adapter_line.should include('} ]')
+      expect(adapter_line).to include('[ result={')
+      expect(adapter_line).to include('} ]')
     end
 
     it "logs gate calls" do
       gate_line = find_line('Flipper feature(search) gate(boolean) open? false')
-      gate_line.should include('[ thing=nil ]')
+      expect(gate_line).to include('[ thing=nil ]')
     end
   end
 
@@ -59,12 +59,12 @@ describe Flipper::Instrumentation::LogSubscriber do
 
     it "logs thing for feature" do
       feature_line = find_line('Flipper feature(search) enabled?')
-      feature_line.should include(user.inspect)
+      expect(feature_line).to include(user.inspect)
     end
 
     it "logs thing for gate" do
       gate_line = find_line('Flipper feature(search) gate(boolean) open')
-      gate_line.should include(user.inspect)
+      expect(gate_line).to include(user.inspect)
     end
   end
 
@@ -78,12 +78,12 @@ describe Flipper::Instrumentation::LogSubscriber do
 
     it "logs feature calls with result in brackets" do
       feature_line = find_line('Flipper feature(search) enable true')
-      feature_line.should include("[ thing=#{user.inspect} gate_name=actor ]")
+      expect(feature_line).to include("[ thing=#{user.inspect} gate_name=actor ]")
     end
 
     it "logs adapter value" do
       adapter_line = find_line('Flipper feature(search) adapter(memory) enable')
-      adapter_line.should include("[ result=")
+      expect(adapter_line).to include("[ result=")
     end
   end
 
@@ -95,7 +95,7 @@ describe Flipper::Instrumentation::LogSubscriber do
 
     it "logs adapter calls" do
       adapter_line = find_line('Flipper adapter(memory) features')
-      adapter_line.should include('[ result=')
+      expect(adapter_line).to include('[ result=')
     end
   end
 

data/spec/flipper/instrumentation/metriks_subscriber_spec.rb

@@ -2,7 +2,7 @@ require 'helper'
 require 'flipper/adapters/memory'
 require 'flipper/instrumentation/metriks'
 
-describe Flipper::Instrumentation::MetriksSubscriber do
+RSpec.describe Flipper::Instrumentation::MetriksSubscriber do
   let(:adapter) { Flipper::Adapters::Memory.new }
   let(:flipper) {
     Flipper.new(adapter, :instrumenter => ActiveSupport::Notifications)
@@ -17,43 +17,43 @@ describe Flipper::Instrumentation::MetriksSubscriber do
   context "for enabled feature" do
     it "updates feature metrics when calls happen" do
       flipper[:stats].enable(user)
-      Metriks.timer("flipper.feature_operation.enable").count.should be(1)
+      expect(Metriks.timer("flipper.feature_operation.enable").count).to be(1)
 
       flipper[:stats].enabled?(user)
-      Metriks.timer("flipper.feature_operation.enabled").count.should be(1)
-      Metriks.meter("flipper.feature.stats.enabled").count.should be(1)
+      expect(Metriks.timer("flipper.feature_operation.enabled").count).to be(1)
+      expect(Metriks.meter("flipper.feature.stats.enabled").count).to be(1)
     end
   end
 
   context "for disabled feature" do
     it "updates feature metrics when calls happen" do
       flipper[:stats].disable(user)
-      Metriks.timer("flipper.feature_operation.disable").count.should be(1)
+      expect(Metriks.timer("flipper.feature_operation.disable").count).to be(1)
 
       flipper[:stats].enabled?(user)
-      Metriks.timer("flipper.feature_operation.enabled").count.should be(1)
-      Metriks.meter("flipper.feature.stats.disabled").count.should be(1)
+      expect(Metriks.timer("flipper.feature_operation.enabled").count).to be(1)
+      expect(Metriks.meter("flipper.feature.stats.disabled").count).to be(1)
     end
   end
 
   it "updates adapter metrics when calls happen" do
     flipper[:stats].enable(user)
-    Metriks.timer("flipper.adapter.memory.enable").count.should be(1)
+    expect(Metriks.timer("flipper.adapter.memory.enable").count).to be(1)
 
     flipper[:stats].enabled?(user)
-    Metriks.timer("flipper.adapter.memory.get").count.should be(1)
+    expect(Metriks.timer("flipper.adapter.memory.get").count).to be(1)
 
     flipper[:stats].disable(user)
-    Metriks.timer("flipper.adapter.memory.disable").count.should be(1)
+    expect(Metriks.timer("flipper.adapter.memory.disable").count).to be(1)
   end
 
   it "updates gate metrics when calls happen" do
     flipper[:stats].enable(user)
     flipper[:stats].enabled?(user)
 
-    Metriks.timer("flipper.gate_operation.boolean.open").count.should be(1)
-    Metriks.timer("flipper.feature.stats.gate_operation.boolean.open").count.should be(1)
-    Metriks.meter("flipper.feature.stats.gate.actor.open").count.should be(1)
-    Metriks.meter("flipper.feature.stats.gate.boolean.closed").count.should be(1)
+    expect(Metriks.timer("flipper.gate_operation.boolean.open").count).to be(1)
+    expect(Metriks.timer("flipper.feature.stats.gate_operation.boolean.open").count).to be(1)
+    expect(Metriks.meter("flipper.feature.stats.gate.actor.open").count).to be(1)
+    expect(Metriks.meter("flipper.feature.stats.gate.boolean.closed").count).to be(1)
   end
 end

data/spec/flipper/instrumentation/statsd_subscriber_spec.rb

@@ -2,7 +2,7 @@ require 'helper'
 require 'flipper/adapters/memory'
 require 'flipper/instrumentation/statsd'
 
-describe Flipper::Instrumentation::StatsdSubscriber do
+RSpec.describe Flipper::Instrumentation::StatsdSubscriber do
   let(:statsd_client) { Statsd.new }
   let(:socket) { FakeUDPSocket.new }
   let(:adapter) { Flipper::Adapters::Memory.new }
@@ -24,11 +24,13 @@ describe Flipper::Instrumentation::StatsdSubscriber do
 
   def assert_timer(metric)
     regex = /#{Regexp.escape metric}\:\d+\|ms/
-    socket.buffer.detect { |op| op.first =~ regex }.should_not be_nil
+    result = socket.buffer.detect { |op| op.first =~ regex }
+    expect(result).not_to be_nil
   end
 
   def assert_counter(metric)
-    socket.buffer.detect { |op| op.first == "#{metric}:1|c" }.should_not be_nil
+    result = socket.buffer.detect { |op| op.first == "#{metric}:1|c" }
+    expect(result).not_to be_nil
   end
 
   context "for enabled feature" do

data/spec/flipper/instrumenters/memory_spec.rb

@@ -1,11 +1,11 @@
 require 'helper'
 require 'flipper/instrumenters/memory'
 
-describe Flipper::Instrumenters::Memory do
+RSpec.describe Flipper::Instrumenters::Memory do
   describe "#initialize" do
     it "sets events to empty array" do
       instrumenter = described_class.new
-      instrumenter.events.should eq([])
+      expect(instrumenter.events).to eq([])
     end
   end
 
@@ -17,10 +17,10 @@ describe Flipper::Instrumenters::Memory do
       block_result = :yielded
 
       result = instrumenter.instrument(name, payload) { block_result }
-      result.should eq(block_result)
+      expect(result).to eq(block_result)
 
       event = described_class::Event.new(name, payload, block_result)
-      instrumenter.events.should eq([event])
+      expect(instrumenter.events).to eq([event])
     end
   end
 end