detour 0.0.3 → 0.0.5

data/spec/features/features_spec.rb

@@ -3,6 +3,17 @@ require "spec_helper"
 describe "listing features for a type" do
   let!(:feature) { create :feature }
 
+  before do
+    ENV["DETOUR_GITHUB_REPO"]   = "jclem/detour"
+    ENV["DETOUR_GITHUB_BRANCH"] = "foo"
+  end
+
+  after do
+    ENV["DETOUR_GITHUB_REPO"]   = nil
+    ENV["DETOUR_GITHUB_BRANCH"] = nil
+  end
+
+
   before do
     Detour.config.grep_dirs = %w[spec/dummy/app/**/*.{rb,erb}]
     visit "/detour/flags/users"
@@ -15,6 +26,39 @@ describe "listing features for a type" do
   it "lists features found in the codebase" do
     page.should have_content "show_widget_table"
   end
+
+  describe "feature check line numbers" do
+    let!(:feature) { create :feature, name: "not-used" }
+
+    context "when the feature has no lines" do
+      it "gets a ban circle" do
+        within "tr#feature_1" do
+          page.should have_selector "i.glyphicon-ban-circle"
+        end
+      end
+    end
+
+    context "when the feature has liens" do
+      it "gets a check mark" do
+        within "tr#new_feature" do
+          page.should have_selector "i.glyphicon-ok"
+        end
+      end
+
+      it "displays its count" do
+        within "tr#new_feature" do
+          page.should have_content "(1 use)"
+        end
+      end
+
+      describe "clicking the check mark", js: true do
+        it "links to the line on GitHub" do
+          page.find("i.glyphicon-ok").click
+          page.should have_link "spec/dummy/app/views/application/index.html.erb#L1", href: "https://github.com/jclem/detour/blob/foo/spec/dummy/app/views/application/index.html.erb#L1"
+        end
+      end
+    end
+  end
 end
 
 describe "creating a new feature", js: true do

data/spec/features/flag_in_flags_spec.rb

@@ -23,73 +23,43 @@ describe "listing flag_in_flags" do
   end
 
   it "displays the flagged-in model's find-by" do
-    page.should have_content flag.flaggable.email
+    page.find("input[type='text'][disabled]").value.should eq flag.flaggable.email
   end
 end
 
-describe "creating flag-ins", js: true do
+describe "creating a flag-in", js: true do
   let(:user) { create :user }
   let!(:feature) { create :feature }
 
   before do
     User.instance_variable_set "@detour_flaggable_find_by", :email
     visit "/detour/flag-ins/#{feature.name}/users"
-    page.find("[data-target='#create-flaggable-flag']").click
+    page.find(".add-fields").click
   end
 
-  context "when creating multiple flag-ins" do
-    let(:user2) { create :user, email: "another_user@example.com" }
-
-    context "when successful" do
-      before do
-        fill_in "ids", with: [user.email, user2.email].join(",")
-        click_button "Create Flag-in"
-      end
-
-      it "displays a success message" do
-        page.should have_content "Users #{user.email}, #{user2.email} have been flagged in to #{feature.name}"
-      end
+  context "when successful" do
+    before do
+      name = page.find("##{page.all("label")[-2][:for]}")[:name]
+      fill_in name, with: user.email
+      click_button "Update Flag-ins"
     end
 
-    context "when unsuccessful" do
-      before do
-        fill_in "ids", with: "#{user.email},foo"
-        click_button "Create Flag-in"
-      end
+    it "displays a flash message" do
+      page.should have_content "Your flag-ins have been updated"
+    end
 
-      it "displays error messages" do
-        page.should have_content "Couldn't find User with email = foo"
-      end
+    it "shows the newly added flag-in" do
+      page.find("input[type='text'][disabled]").value.should eq user.email
     end
   end
 
-  context "when creating single flag-ins" do
-    context "when successful" do
-      before do
-        fill_in "ids", with: user.email
-        click_button "Create Flag-in"
-      end
-
-      it "displays a success message" do
-        page.should have_content "User #{user.email} has been flagged in to #{feature.name}"
-      end
-
-      it "renders the new flag-in" do
-        within "table" do
-          page.should have_content user.email
-        end
-      end
+  context "when unsuccessful" do
+    before do
+      click_button "Update Flag-in"
     end
 
-    context "when unsuccessful" do
-      before do
-        fill_in "ids", with: "foo"
-        click_button "Create Flag-in"
-      end
-
-      it "displays error messages" do
-        page.should have_content "Couldn't find User with email = foo"
-      end
+    it "displays error messages" do
+      page.should have_content "Users flag ins user \"\" could not be found"
     end
   end
 end
@@ -99,20 +69,12 @@ describe "destroying flag-ins", js: true do
 
   before do
     visit "/detour/flag-ins/#{flag.feature.name}/users"
-    page.find(".delete-flag").click
-    click_link "Delete Flag-in"
+    name = page.find("##{page.all("label").last[:for]}")[:name]
+    check name
+    click_button "Update Flag-in"
   end
 
-  it "displays a flash message" do
-    page.should have_content "#{flag.feature.name} flag-in for User #{flag.flaggable.send flag.flaggable_type.constantize.detour_flaggable_find_by} has been deleted."
-  end
-
-  it "destroys the flag-in" do
-    expect { flag.reload }.to raise_error ActiveRecord::RecordNotFound
-  end
-
-
   it "removes the flag from the list" do
-    page.should_not have_content flag.flaggable.email
+    page.should_not have_selector "label[for='feature_flag_in_flags_attributes_0_flaggable_key']"
   end
 end

data/spec/features/opt_out_flags_spec.rb

@@ -14,69 +14,52 @@ describe "counting opt out flags" do
   end
 end
 
-describe "creating opt-outs", js: true do
+describe "listing opt_out_flags" do
+  let!(:flag) { create :opt_out_flag }
+
+  before do
+    User.instance_variable_set "@detour_flaggable_find_by", :email
+    visit "/detour/opt-outs/#{flag.feature.name}/users"
+  end
+
+  it "displays the opted-out model's find-by" do
+    page.find("input[type='text'][disabled]").value.should eq flag.flaggable.email
+  end
+end
+
+describe "creating a opt-out", js: true do
   let(:user) { create :user }
   let!(:feature) { create :feature }
 
   before do
     User.instance_variable_set "@detour_flaggable_find_by", :email
     visit "/detour/opt-outs/#{feature.name}/users"
-    page.find("[data-target='#create-flaggable-flag']").click
+    page.find(".add-fields").click
   end
 
-  context "when creating multiple opt-outs" do
-    let(:user2) { create :user, email: "another_user@example.com" }
-
-    context "when successful" do
-      before do
-        fill_in "ids", with: [user.email, user2.email].join(",")
-        click_button "Create Opt-out"
-      end
-
-      it "displays a success message" do
-        page.should have_content "Users #{user.email}, #{user2.email} have been opted out of #{feature.name}"
-      end
+  context "when successful" do
+    before do
+      name = page.find("##{page.all("label")[-2][:for]}")[:name]
+      fill_in name, with: user.email
+      click_button "Update Opt-outs"
     end
 
-    context "when unsuccessful" do
-      before do
-        fill_in "ids", with: "#{user.email},foo"
-        click_button "Create Opt-out"
-      end
+    it "displays a flash message" do
+      page.should have_content "Your opt-outs have been updated"
+    end
 
-      it "displays error messages" do
-        page.should have_content "Couldn't find User with email = foo"
-      end
+    it "shows the newly added opt-out" do
+      page.find("input[type='text'][disabled]").value.should eq user.email
     end
   end
 
-  context "when creating single opt-outs" do
-    context "when successful" do
-      before do
-        fill_in "ids", with: user.email
-        click_button "Create Opt-out"
-      end
-
-      it "displays a success message" do
-        page.should have_content "User #{user.email} has been opted out of #{feature.name}"
-      end
-
-      it "renders the new opt-out" do
-        within "table" do
-          page.should have_content user.email
-        end
-      end
+  context "when unsuccessful" do
+    before do
+      click_button "Update Opt-outs"
     end
 
-    context "when unsuccessful" do
-      before do
-        fill_in "ids", with: "foo"
-        click_button "Create Opt-out"
-      end
-
-      it "displays error messages" do
-        page.should have_content "Couldn't find User with email = foo"
-      end
+    it "displays error messages" do
+      page.should have_content "Users opt outs user \"\" could not be found"
     end
   end
 end
@@ -86,20 +69,12 @@ describe "destroying opt-outs", js: true do
 
   before do
     visit "/detour/opt-outs/#{flag.feature.name}/users"
-    page.find(".delete-flag").click
-    click_link "Delete Opt-out"
+    name = page.find("##{page.all("label").last[:for]}")[:name]
+    check name
+    click_button "Update Opt-outs"
   end
 
-  it "displays a flash message" do
-    page.should have_content "#{flag.feature.name} opt-out for User #{flag.flaggable.send flag.flaggable_type.constantize.detour_flaggable_find_by} has been deleted."
-  end
-
-  it "destroys the opt-out" do
-    expect { flag.reload }.to raise_error ActiveRecord::RecordNotFound
-  end
-
-
   it "removes the flag from the list" do
-    page.should_not have_content flag.flaggable.email
+    page.should_not have_selector "label[for='feature_opt_out_flags_attributes_0_flaggable_key']"
   end
 end

data/spec/integration/group_rollout_spec.rb

@@ -3,7 +3,7 @@ require "spec_helper"
 describe "group rollouts" do
   let(:user) { User.create(name: "foo") }
   let(:feature) { Detour::Feature.create(name: "foo") }
-  let!(:flag) { feature.group_flags.create(flaggable_type: "User", group_name: "foo_users") }
+  let!(:flag) { feature.defined_group_flags.create(flaggable_type: "User", group_name: "foo_users") }
 
   describe "creating a group rollout" do
     before do
@@ -13,7 +13,7 @@ describe "group rollouts" do
     end
 
     it "sets the feature on the user" do
-      feature.match_groups?(user).should be_true
+      feature.match_defined_groups?(user).should be_true
     end
   end
 end

data/spec/lib/detour/acts_as_flaggable_spec.rb

@@ -14,16 +14,25 @@ describe Detour::ActsAsFlaggable do
   describe "#acts_as_flaggable" do
     describe "Detour::Feature associations" do
       subject { Detour::Feature.new }
-      it { should have_many(:users_group_flags).class_name("Detour::GroupFlag").dependent(:destroy) }
-      it { should allow_mass_assignment_of(:users_group_flags_attributes) }
-      it { should accept_nested_attributes_for(:users_group_flags) }
+      it { should have_many(:users_defined_group_flags).class_name("Detour::DefinedGroupFlag").dependent(:destroy) }
+      it { should allow_mass_assignment_of(:users_defined_group_flags_attributes) }
+      it { should accept_nested_attributes_for(:users_defined_group_flags) }
+
+      it { should have_many(:users_database_group_flags).class_name("Detour::DatabaseGroupFlag").dependent(:destroy) }
+      it { should allow_mass_assignment_of(:users_database_group_flags_attributes) }
+      it { should accept_nested_attributes_for(:users_database_group_flags)}
 
       it { should have_one(:users_percentage_flag).class_name("Detour::PercentageFlag").dependent(:destroy) }
       it { should allow_mass_assignment_of(:users_percentage_flag_attributes) }
       it { should accept_nested_attributes_for(:users_percentage_flag) }
 
       it { should have_many(:users_flag_ins).class_name("Detour::FlagInFlag").dependent(:destroy) }
+      it { should allow_mass_assignment_of(:users_flag_ins_attributes) }
+      it { should accept_nested_attributes_for(:users_flag_ins) }
+
       it { should have_many(:users_opt_outs).class_name("Detour::OptOutFlag").dependent(:destroy) }
+      it { should allow_mass_assignment_of(:users_opt_outs_attributes) }
+      it { should accept_nested_attributes_for(:users_opt_outs) }
     end
 
     context "when given a :find_by parameter" do

data/spec/lib/detour/configuration_spec.rb

@@ -2,14 +2,18 @@ require "spec_helper"
 
 describe Detour::Configuration do
   describe ".define_group_for_class" do
-    let(:block) { Proc.new {} }
+    let(:block) { Proc.new { "foo!" } }
 
     before do
       subject.send :define_group_for_class, "User", "user_id_1", &block
     end
 
     it "defines a group for the given class" do
-      subject.defined_groups["User"].should eq({ "user_id_1" => block })
+      subject.defined_groups["User"].values[0].name.should eq "user_id_1"
+    end
+
+    it "assigns the test for the group" do
+      subject.defined_groups["User"].values[0].test(1).should eq "foo!"
     end
   end
 

data/spec/lib/detour/flag_form_spec.rb

@@ -15,17 +15,6 @@ describe Detour::FlagForm do
     end
   end
 
-  describe "#group_names" do
-    before do
-      Detour.config.define_user_group :admins do |user|
-      end
-    end
-
-    it "returns the name of defined groups" do
-      subject.group_names.should eq ["admins"]
-    end
-  end
-
   describe "#update_attributes" do
     let(:features_params) do
       {

data/spec/lib/detour/flaggable_spec.rb

@@ -38,59 +38,6 @@ describe Detour::Flaggable do
       user.has_feature?(feature.name)
     end
 
-    context "when given a block" do
-      context "and the user is flagged in" do
-        before do
-          feature.flag_in_flags.create(flaggable: user)
-        end
-
-        it "calls the block" do
-          foo = "foo"
-          user.has_feature?(feature.name) { foo = "bar" }
-          foo.should eq "bar"
-        end
-
-        it "returns the match" do
-          foo = "foo"
-
-          if user.has_feature? :not_feature do
-          end; else
-            foo = "bar"
-          end
-
-          foo.should eq "bar"
-        end
-
-        context "when the block raises an exception" do
-          it "increments the failure_count of the feature" do
-            begin
-              user.has_feature? feature.name do
-                raise "This is an exception"
-              end
-            rescue
-              feature.reload.failure_count.should eq 1
-            end
-          end
-
-          it "raises the exception" do
-            expect do
-              user.has_feature? feature.name do
-                raise "This is an exception"
-              end
-            end.to raise_error "This is an exception"
-          end
-        end
-      end
-
-      context "and the user is not flagged in" do
-        it "does not call the block" do
-          foo = "foo"
-          user.has_feature?(feature.name) { foo = "bar" }
-          foo.should eq "foo"
-        end
-      end
-    end
-
     context "when the user is not flagged in" do
       it "returns false" do
         user.has_feature?(feature.name).should be_false
@@ -136,7 +83,7 @@ describe Detour::Flaggable do
               _user.name == user.name
             end
 
-            feature.group_flags.create(flaggable_type: "User", group_name: "name_foo")
+            feature.defined_group_flags.create(flaggable_type: "User", group_name: "name_foo")
           end
 
           it "returns true" do

data/spec/models/detour/database_group_flag_spec.rb

@@ -0,0 +1,29 @@
+require "spec_helper"
+
+describe Detour::DatabaseGroupFlag do
+  it { should validate_presence_of :group_id }
+  it { should validate_presence_of :flaggable_type }
+  it { should validate_uniqueness_of(:feature_id).scoped_to(:group_id) }
+
+  it { should allow_mass_assignment_of :group_id }
+
+  it { should belong_to :group }
+  it { should have_many(:memberships).through(:group) }
+
+  describe "#members" do
+    let(:flag) { create :database_group_flag }
+    let!(:membership) { create :membership, group: flag.group }
+
+    it "returns its membership members" do
+      flag.members.should eq [membership.member]
+    end
+  end
+
+  describe "#group_name" do
+    let(:flag) { create :database_group_flag }
+
+    it "returns the name of the group" do
+      flag.group_name.should eq flag.group.name
+    end
+  end
+end

data/spec/models/detour/defined_group_spec.rb

@@ -0,0 +1,21 @@
+require "spec_helper"
+
+describe Detour::Group do
+  it { should validate_presence_of   :name }
+  it { should validate_presence_of   :flaggable_type }
+  it { should validate_uniqueness_of(:name).scoped_to(:flaggable_type) }
+  it { should ensure_inclusion_of(:flaggable_type).in_array(Detour.config.flaggable_types) }
+
+  it { should accept_nested_attributes_for :memberships }
+
+  it { should have_many(:memberships).dependent(:destroy) }
+  it { should allow_mass_assignment_of :name }
+  it { should allow_mass_assignment_of :flaggable_type }
+
+  describe "#to_s" do
+    it "returns the group name" do
+      group = create :group
+      group.to_s.should eq group.name
+    end
+  end
+end