detour 0.0.3 → 0.0.5

data/spec/controllers/detour/flaggable_flags_controller_spec.rb

@@ -10,8 +10,8 @@ describe Detour::FlaggableFlagsController do
       get :index, feature_name: flag.feature.name, flaggable_type: "users"
     end
 
-    it "assigns the flag-in flags" do
-      assigns(:flags).should eq [flag]
+    it "assigns the feature" do
+      assigns(:feature).should eq flag.feature
     end
 
     it "renders the index template" do
@@ -19,82 +19,45 @@ describe Detour::FlaggableFlagsController do
     end
   end
 
-  describe "POST #create" do
-    let!(:user)    { create :user }
-    let(:feature) { create :feature }
-
-    context "when creating multiple flag-ins" do
-      let!(:user2) { create :user, email: "another@example.com" }
-
-      before do
-        post :create, feature_name: feature.name, flaggable_type: user.class.table_name, ids: ids, format: :js
-      end
+  describe "PUT #update" do
+    let(:flag) { create :flag_in_flag }
 
-      context "when successful" do
-        let(:ids) { [user.id.to_s, user2.id.to_s].join(",") }
+    before do
+      put :update, feature_name: flag.feature.name, flaggable_type: "users", feature: flag_params
+    end
 
-        it "creates the flag-in" do
-          feature.users_flag_ins.collect(&:flaggable).should eq [user, user2]
-        end
+    context "when successful" do
+      let(:user) { create :user }
 
-        it "sets a flash message" do
-          flash[:notice].should eq "#{user.class.to_s.pluralize} #{user.id}, #{user2.id} have been flagged in to #{feature.name}"
-        end
+      let(:flag_params) do
+        {
+          users_flag_ins_attributes: {
+            "1" => { flaggable_type: "User", flaggable_key: user.id, _destroy: 0 }
+          }
+        }
       end
 
-      context "when unsuccessful" do
-        let(:ids) { "foo" }
-
-        it "renders the errors template" do
-          response.should render_template "error"
-        end
+      it "sets a flash message" do
+        flash[:notice].should eq "Your flag-ins have been updated"
       end
 
-      context "when creating a single flag-in" do
-        before do
-          post :create, feature_name: feature.name, flaggable_type: user.class.table_name, ids: ids, format: :js
-        end
-
-        context "when successful" do
-          let(:ids) { user.id.to_s }
-
-          it "creates the flag-in" do
-            feature.users_flag_ins.collect(&:flaggable).should eq [user]
-          end
-
-          it "sets a flash message" do
-            flash[:notice].should eq "#{user.class} #{user.id} has been flagged in to #{feature.name}"
-          end
-        end
-
-        context "when the flaggable can't be found" do
-          let(:ids) { "foo" }
-
-          it "renders the errors template" do
-            response.should render_template "error"
-          end
-        end
+      it "redirect to the group" do
+        response.should redirect_to flag_in_flags_path(feature_name: flag.feature.name, flaggable_type: "users")
       end
     end
-  end
-
-  describe "DELETE #destroy" do
-    let(:flag) { create :flag_in_flag }
-
-    before do
-      delete :destroy, feature_name: flag.feature.name, flaggable_type: "users", id: flag.id
-    end
 
-    it "destroys the flag" do
-      expect { flag.reload }.to raise_error ActiveRecord::RecordNotFound
-    end
-
-    it "sets a flash message" do
-      flash[:notice].should eq "#{flag.feature.name} flag-in for User #{flag.flaggable.id} has been deleted."
-    end
+    context "when unsuccessful" do
+      let(:flag_params) do
+        {
+          users_flag_ins_attributes: {
+            "1" => { flaggable_type: "User", flaggable_key: nil, _destroy: 0 }
+          }
+        }
+      end
 
-    it "redirects to the flag-ins index" do
-      response.should redirect_to flag_in_flags_path flag.feature.name, "users"
+      it "renders the show template" do
+        response.should render_template :index
+      end
     end
   end
 end

data/spec/controllers/detour/groups_controller_spec.rb

@@ -0,0 +1,107 @@
+require "spec_helper"
+
+describe Detour::GroupsController do
+  routes { Detour::Engine.routes }
+
+  describe "GET #index" do
+    let!(:group) { create :group }
+
+    before do
+      get :index
+    end
+
+    it "assigns the groups" do
+      assigns(:groups).should eq [group]
+    end
+
+    it "renders the index template" do
+      response.should render_template "groups/index"
+    end
+  end
+
+  describe "GET #show" do
+    let!(:group) { create :group }
+
+    before do
+      get :show, id: group.to_param
+    end
+
+    it "assigns the groups" do
+      assigns(:group).should eq group
+    end
+
+    it "renders the show template" do
+      response.should render_template "groups/show"
+    end
+  end
+
+  describe "POST #create" do
+    before do
+      post :create, format: :js, group: group_params
+    end
+
+    context "when successful" do
+      let(:group_params) { { name: "Foo Group", flaggable_type: "User" } }
+
+      it "sets a flash message" do
+        flash[:notice].should eq "Your group has been successfully created."
+      end
+
+      it "renders the success template" do
+        response.should render_template "success"
+      end
+    end
+
+    context "when unsuccessful" do
+      let(:group_params) { { name: "" } }
+
+      it "renders the errors template" do
+        response.should render_template "error"
+      end
+    end
+  end
+
+  describe "PUT #update" do
+    let(:group) { create :group }
+
+    before do
+      put :update, id: group.to_param, group: group_params
+    end
+
+    context "when successful" do
+      let(:group_params) { { name: "New Group Name" } }
+
+      it "sets a flash message" do
+        flash[:notice].should eq "Your group has been successfully updated."
+      end
+
+      it "redirect to the group" do
+        response.should redirect_to group_path group
+      end
+    end
+
+    context "when unsuccessful" do
+      let(:group_params) { { name: "" } }
+
+      it "renders the show template" do
+        response.should render_template "show"
+      end
+    end
+  end
+
+  describe "DELETE #destroy" do
+    let(:group) { create :group }
+
+    before do
+      delete :destroy, id: group.to_param
+    end
+
+    it "sets a flash message" do
+      flash[:notice].should eq "Group \"#{group.name}\" has been deleted."
+    end
+
+    it "redirects to the groups path" do
+      response.should redirect_to groups_path
+    end
+  end
+end

data/spec/dummy/db/migrate/20131221052201_setup_detour.rb

@@ -2,7 +2,6 @@ class SetupDetour < ActiveRecord::Migration
   def change
     create_table :detour_features do |t|
       t.string :name
-      t.integer :failure_count, default: 0
       t.text    :flag_in_counts, default: "{}"
       t.text    :opt_out_counts, default: "{}"
       t.timestamps
@@ -15,6 +14,7 @@ class SetupDetour < ActiveRecord::Migration
       t.integer :feature_id
       t.integer :flaggable_id
       t.string  :flaggable_type
+      t.integer :group_id
       t.string  :group_name
       t.integer :percentage
       t.timestamps
@@ -22,11 +22,31 @@ class SetupDetour < ActiveRecord::Migration
 
     add_index :detour_flags, :type
     add_index :detour_flags, :feature_id
+    add_index :detour_flags, :group_id
+    add_index :detour_flags,
+      [:type, :feature_id, :group_id]
     add_index :detour_flags,
       [:type, :feature_id, :flaggable_type, :flaggable_id],
       name: "flag_type_feature_flaggable_type_id"
     add_index :detour_flags,
       [:type, :feature_id, :flaggable_type],
     name: "flag_type_feature_flaggable_type"
+
+    create_table :detour_groups do |t|
+      t.string :name
+      t.string :flaggable_type
+      t.timestamps
+    end
+
+    create_table :detour_memberships do |t|
+      t.integer  :group_id
+      t.string   :member_type
+      t.integer  :member_id
+      t.timestamps
+    end
+
+    add_index :detour_memberships, [:group_id, :member_type, :member_id],
+      name: :detour_memberships_membership_index,
+      unique: true
   end
 end

data/spec/dummy/db/schema.rb

@@ -15,7 +15,6 @@ ActiveRecord::Schema.define(:version => 20131221052201) do
 
   create_table "detour_features", :force => true do |t|
     t.string   "name"
-    t.integer  "failure_count",  :default => 0
     t.text     "flag_in_counts", :default => "{}"
     t.text     "opt_out_counts", :default => "{}"
     t.datetime "created_at",                       :null => false
@@ -29,6 +28,7 @@ ActiveRecord::Schema.define(:version => 20131221052201) do
     t.integer  "feature_id"
     t.integer  "flaggable_id"
     t.string   "flaggable_type"
+    t.integer  "group_id"
     t.string   "group_name"
     t.integer  "percentage"
     t.datetime "created_at",     :null => false
@@ -36,10 +36,29 @@ ActiveRecord::Schema.define(:version => 20131221052201) do
   end
 
   add_index "detour_flags", ["feature_id"], :name => "index_detour_flags_on_feature_id"
+  add_index "detour_flags", ["group_id"], :name => "index_detour_flags_on_group_id"
   add_index "detour_flags", ["type", "feature_id", "flaggable_type", "flaggable_id"], :name => "flag_type_feature_flaggable_type_id"
   add_index "detour_flags", ["type", "feature_id", "flaggable_type"], :name => "flag_type_feature_flaggable_type"
+  add_index "detour_flags", ["type", "feature_id", "group_id"], :name => "index_detour_flags_on_type_and_feature_id_and_group_id"
   add_index "detour_flags", ["type"], :name => "index_detour_flags_on_type"
 
+  create_table "detour_groups", :force => true do |t|
+    t.string   "name"
+    t.string   "flaggable_type"
+    t.datetime "created_at",     :null => false
+    t.datetime "updated_at",     :null => false
+  end
+
+  create_table "detour_memberships", :force => true do |t|
+    t.integer  "group_id"
+    t.string   "member_type"
+    t.integer  "member_id"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+  end
+
+  add_index "detour_memberships", ["group_id", "member_type", "member_id"], :name => "detour_memberships_membership_index", :unique => true
+
   create_table "users", :force => true do |t|
     t.string   "email"
     t.string   "name"

data/spec/factories/database_group_flag.rb

@@ -0,0 +1,7 @@
+FactoryGirl.define do
+  factory :database_group_flag, class: "Detour::DatabaseGroupFlag" do
+    feature
+    flaggable_type "User"
+    group
+  end
+end

data/spec/factories/{group_flag.rb → defined_group_flag.rb}

@@ -1,5 +1,5 @@
 FactoryGirl.define do
-  factory :group_flag, class: "Detour::GroupFlag" do
+  factory :defined_group_flag, class: "Detour::DefinedGroupFlag" do
     feature
     flaggable_type "User"
     group_name "foo users"

data/spec/factories/group.rb

@@ -0,0 +1,10 @@
+FactoryGirl.define do
+  sequence :name do |n|
+    "Group #{n}"
+  end
+
+  factory :group, class: "Detour::Group" do
+    flaggable_type "User"
+    name
+  end
+end

data/spec/factories/membership.rb

@@ -0,0 +1,6 @@
+FactoryGirl.define do
+  factory :membership, class: "Detour::Membership" do
+    association :member, factory: :user
+    group
+  end
+end

data/spec/features/database_group_flags_spec.rb

@@ -0,0 +1,50 @@
+require "spec_helper"
+
+describe "creating database group flags" do
+  let!(:feature) { create :feature }
+  let!(:group) { create :group, flaggable_type: "User" }
+  let(:checkbox) { "features[#{feature.name}][users_database_group_flags_attributes[#{group.name}]][to_keep]" }
+
+  before do
+    visit "/detour/flags/users"
+    check checkbox
+  end
+
+  it "creates the database group flag" do
+    click_button "Save Changes"
+    feature.reload.users_database_group_flags.map(&:group).should eq [group]
+  end
+
+  context "when there are errors in other fields" do
+    it "preserves the database group flag option" do
+      fill_in "features[#{feature.name}][users_percentage_flag_attributes][percentage]", with: 101
+      click_button "Save Changes"
+      page.find("input[type='checkbox'][name='#{checkbox}']").should be_checked
+    end
+  end
+end
+
+describe "removing database group flags" do
+  let!(:feature) { create :feature }
+  let(:group) { create :group, flaggable_type: "User" }
+  let!(:group_flag) { create :database_group_flag, feature: feature, group: group, flaggable_type: "User" }
+  let(:checkbox) { "features[#{feature.name}][users_database_group_flags_attributes[#{group.name}]][to_keep]" }
+
+  before do
+    visit "/detour/flags/users"
+    uncheck checkbox
+  end
+
+  it "removes the database group flag" do
+    click_button "Save Changes"
+    feature.reload.users_database_group_flags.should be_empty
+  end
+
+  context "when there are errors in other fields" do
+    it "preserves the database group flag option" do
+      fill_in "features[#{feature.name}][users_percentage_flag_attributes][percentage]", with: 101
+      click_button "Save Changes"
+      page.find("input[type='checkbox'][name='#{checkbox}']").should_not be_checked
+    end
+  end
+end

data/spec/features/database_groups_spec.rb

@@ -0,0 +1,174 @@
+require "spec_helper"
+
+describe "listing groups" do
+  let!(:group) { create :group }
+
+  before do
+    visit "/detour/groups"
+  end
+
+  it "lists every group" do
+    within "ul li.group" do
+      page.should have_content group.name
+    end
+  end
+end
+
+describe "showing a group" do
+  let(:user)       { create :user }
+  let(:group)      { create :group }
+
+  before do
+    User.instance_variable_set "@detour_flaggable_find_by", :email
+    create :membership, group: group, member: user
+    visit "/detour/groups/#{group.to_param}"
+  end
+
+  it "lists every membership" do
+    page.find("input[name=member_identifier]").value.should eq user.email
+  end
+end
+
+describe "creating a group", js: true do
+  before do
+    visit "/detour/groups"
+    page.find("[data-target='#create-group']").click
+  end
+
+  context "when successful" do
+    before do
+      fill_in "group[name]", with: "New Group"
+      select "User", from: "group[flaggable_type]"
+      click_button "Create Group"
+    end
+
+    it "displays a flash message" do
+      page.should have_content "Your group has been successfully created."
+    end
+
+    it "shows the newly created group" do
+      within "ul li.group" do
+        page.should have_content "New Group"
+      end
+    end
+  end
+
+  context "when unsuccessful" do
+    before do
+      click_button "Create Group"
+    end
+
+    it "displays error messages" do
+      page.should have_content "Name can't be blank"
+    end
+  end
+end
+
+describe "updating a group" do
+  let(:group) { create :group }
+
+  before do
+    visit "/detour/groups/#{group.to_param}"
+  end
+
+  context "when successful" do
+    before do
+      fill_in "group[name]", with: "New Group Name"
+      click_button "Update Group"
+    end
+
+    it "displays a flash message" do
+      page.should have_content "Your group has been successfully updated."
+    end
+
+    it "shows the newly updated group" do
+      within "h1" do
+        page.should have_content "New Group Name"
+      end
+    end
+  end
+
+  context "when unsuccessful" do
+    before do
+      fill_in "group[name]", with: ""
+      click_button "Update Group"
+    end
+
+    it "displays error messages" do
+      page.should have_content "Name can't be blank"
+    end
+  end
+end
+
+describe "adding a member to a group", js: true do
+  let(:group) { create :group }
+  let!(:user) { create :user }
+
+  before do
+    User.instance_variable_set "@detour_flaggable_find_by", :email
+    visit "/detour/groups/#{group.to_param}"
+    page.find(".add-fields").click
+  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 Group"
+    end
+
+    it "displays a flash message" do
+      page.should have_content "Your group has been successfully updated."
+    end
+
+    it "shows the newly added member" do
+      page.find("input[type='text'][disabled]").value.should eq user.email
+    end
+  end
+
+  context "when unsuccessful" do
+    before do
+      click_button "Update Group"
+    end
+
+    it "displays error messages" do
+      page.should have_content "Memberships user \"\" could not be found"
+    end
+  end
+end
+
+describe "removing a member from a group" do
+  let(:group) { create :group }
+  let(:user) { create :user }
+  let!(:membership) { create :membership, group: group, member: user }
+
+  before do
+    User.instance_variable_set "@detour_flaggable_find_by", :email
+    visit "/detour/groups/#{group.to_param}"
+    name = page.find("##{page.all("label").last[:for]}")[:name]
+    check name
+    click_button "Update Group"
+  end
+
+  it "does not show the removed member" do
+    page.should_not have_selector "label[for='group_memberships_attributes_0_member_key']"
+  end
+end
+
+describe "destroying a group", js: true do
+  let!(:group) { create :group }
+
+  before do
+    visit "/detour/groups/#{group.to_param}"
+    click_button "Delete Group"
+    page.find(".modal a").click
+  end
+
+  it "shows a flash message" do
+    page.should have_content "Group \"#{group.name}\" has been deleted"
+  end
+
+  it "shows the remaining groups" do
+    page.should_not have_selector ".group"
+  end
+end

data/spec/features/defined_group_flags_spec.rb

@@ -0,0 +1,67 @@
+require "spec_helper"
+
+describe "listing defined groups" do
+  before do
+    Detour.config.define_user_group :admins do |user|
+    end
+
+    visit "/detour/flags/users"
+  end
+
+  it "displays the defined groups" do
+    page.should have_content "admins"
+  end
+end
+
+describe "creating defined group flags" do
+  let!(:feature) { create :feature }
+  let(:checkbox) { "features[#{feature.name}][users_defined_group_flags_attributes[admins]][to_keep]" }
+
+  before do
+    Detour.config.define_user_group :admins do |user|
+    end
+
+    visit "/detour/flags/users"
+    check checkbox
+  end
+
+  it "creates the group flag" do
+    click_button "Save Changes"
+    feature.reload.users_defined_group_flags.first.group_name.should eq "admins"
+  end
+
+  context "when there are errors in other fields" do
+    it "preserves the database group flag option" do
+      fill_in "features[#{feature.name}][users_percentage_flag_attributes][percentage]", with: 101
+      click_button "Save Changes"
+      page.find("input[type='checkbox'][name='#{checkbox}']").should be_checked
+    end
+  end
+end
+
+describe "removing defined group flags" do
+  let(:feature)     { create :feature }
+  let!(:group_flag) { create :defined_group_flag, feature: feature, group_name: "admins" }
+  let(:checkbox) { "features[#{feature.name}][users_defined_group_flags_attributes[admins]][to_keep]" }
+
+  before do
+    Detour.config.define_user_group :admins do |user|
+    end
+
+    visit "/detour/flags/users"
+    uncheck checkbox
+  end
+
+  it "creates the group flag" do
+    click_button "Save Changes"
+    feature.reload.users_defined_group_flags.should be_empty
+  end
+
+  context "when there are errors in other fields" do
+    it "preserves the database group flag option" do
+      fill_in "features[#{feature.name}][users_percentage_flag_attributes][percentage]", with: 101
+      click_button "Save Changes"
+      page.find("input[type='checkbox'][name='#{checkbox}']").should_not be_checked
+    end
+  end
+end