Finish select2-ajax for users. Added Select2Helper for tests

Dmitriy Zaporozhets
1 parent 10f14136
Showing 12 changed files with 324 additions and 290 deletions Show diff stats
app/assets/javascripts/users_select.js.coffee
app/assets/stylesheets/application.scss
app/assets/stylesheets/common.scss
app/assets/stylesheets/ref_select.scss
app/assets/stylesheets/selects.scss
app/controllers/application_controller.rb
features/project/team_management.feature
features/steps/project/project_team_management.rb
features/steps/userteams/userteams.rb
features/support/env.rb
features/teams/team.feature
spec/support/select2_helper.rb
@@ -19,7 +19,7 @@ $ -&gt;
     multiple: $('.ajax-users-select').hasClass('multiselect')
     minimumInputLength: 0
     ajax: # instead of writing the function to execute the request we use Select2's convenient helper
-      url: "/api/v3/users.json"
+      url: "/api/" + gon.api_version + "/users.json"
       dataType: "json"
       data: (term, page) ->
         search: term # search term
@@ -33,11 +33,11 @@ $ -&gt;
     initSelection: (element, callback) ->
       id = $(element).val()
       if id isnt ""
-        $.ajax("http://api.rottentomatoes.com/api/public/v1.0/users/" + id + ".json",
+        $.ajax(
+          "/api/" + gon.api_version + "/users/" + id + ".json",
+          dataType: "json"
           data:
-            apikey: "ju6z9mjyajq2djue3gbvv26t"
-
-          dataType: "jsonp"
+            private_token: gon.api_token
         ).done (data) ->
           callback data
@@ -15,7 +15,7 @@
 @import "gitlab_bootstrap.scss";
 @import "common.scss";
-@import "ref_select.scss";
+@import "selects.scss";
 @import "sections/header.scss";
 @import "sections/nav.scss";
@@ -555,17 +555,3 @@ img.emoji {
   display: none;
 }
-.ajax-users-select {
-  width: 400px;
-}
-
-.user-result {
-  .user-image {
-    float: left;
-  }
-  .user-name {
-  }
-  .user-username {
-    color: #999;
-  }
-}
@@ -1,90 +0,0 @@
-/** Branch/tag selector **/
-.project-refs-form {
-  margin: 0;
-  span {
-    background:none !important;
-    position:static !important;
-    width:auto !important;
-    height:auto !important;
-  }
-}
-.project-refs-select {
-  width: 120px;
-}
-
-.project-refs-form .chzn-container {
-  position: relative;
-  top: 0;
-  left: 0;
-  margin-right: 10px;
-
-  .chzn-drop {
-    min-width: 400px;
-    .chzn-results {
-      max-height: 300px;
-    }
-    .chzn-search input {
-      min-width: 365px;
-    }
-  }
-}
-
-/** Fix for Search Dropdown Border **/
-.chzn-container {
-  .chzn-search {
-    input:focus {
-      @include box-shadow(none);
-    }
-  }
-
-  .chzn-drop {
-    margin: 7px 0;
-    min-width: 200px;
-    border: 1px solid #bbb;
-    @include border-radius(0);
-
-    .chzn-results {
-      margin-top: 5px;
-      max-height: 300px;
-
-      .group-result {
-        color: $style_color;
-        border-bottom: 1px solid #EEE;
-        padding: 8px;
-      }
-      .active-result {
-        @include border-radius(0);
-
-        &.highlighted {
-          background: $hover;
-          color: $style_color;
-        }
-        &.result-selected {
-          background: #EEE;
-          border-left: 4px solid #CCC;
-        }
-      }
-    }
-
-    .chzn-search {
-      @include bg-gray-gradient;
-      input {
-        min-width: 165px;
-        border-color: #CCC;
-      }
-    }
-  }
-
-  .chzn-single {
-    @include bg-light-gray-gradient;
-
-    div {
-      background: transparent;
-      border-left: none;
-    }
-
-    span {
-      font-weight: normal;
-    }
-  }
-}
@@ -0,0 +1,110 @@
+.ajax-users-select {
+  width: 400px;
+}
+
+.user-result {
+  .user-image {
+    float: left;
+  }
+  .user-name {
+  }
+  .user-username {
+    color: #999;
+  }
+}
+
+.select2-no-results {
+  padding: 7px;
+  color: #666;
+}
+
+/** Branch/tag selector **/
+.project-refs-form {
+  margin: 0;
+  span {
+    background:none !important;
+    position:static !important;
+    width:auto !important;
+    height:auto !important;
+  }
+}
+.project-refs-select {
+  width: 120px;
+}
+
+.project-refs-form .chzn-container {
+  position: relative;
+  top: 0;
+  left: 0;
+  margin-right: 10px;
+
+  .chzn-drop {
+    min-width: 400px;
+    .chzn-results {
+      max-height: 300px;
+    }
+    .chzn-search input {
+      min-width: 365px;
+    }
+  }
+}
+
+/** Fix for Search Dropdown Border **/
+.chzn-container {
+  .chzn-search {
+    input:focus {
+      @include box-shadow(none);
+    }
+  }
+
+  .chzn-drop {
+    margin: 7px 0;
+    min-width: 200px;
+    border: 1px solid #bbb;
+    @include border-radius(0);
+
+    .chzn-results {
+      margin-top: 5px;
+      max-height: 300px;
+
+      .group-result {
+        color: $style_color;
+        border-bottom: 1px solid #EEE;
+        padding: 8px;
+      }
+      .active-result {
+        @include border-radius(0);
+
+        &.highlighted {
+          background: $hover;
+          color: $style_color;
+        }
+        &.result-selected {
+          background: #EEE;
+          border-left: 4px solid #CCC;
+        }
+      }
+    }
+
+    .chzn-search {
+      @include bg-gray-gradient;
+      input {
+        min-width: 165px;
+        border-color: #CCC;
+      }
+    }
+  }
+
+  .chzn-single {
+    @include bg-light-gray-gradient;
+
+    div {
+      background: transparent;
+      border-left: none;
+    }
+
+    span {
+      font-weight: normal;
+    }
+  }
+}
@@ -152,9 +152,8 @@ class ApplicationController &lt; ActionController::Base
   def add_gon_variables
     gon.default_issues_tracker = Project.issues_tracker.default_value
-    if current_user
-      gon.api_token = current_user.private_token
-      gon.gravatar_url = request.ssl? ? Gitlab.config.gravatar.ssl_url : Gitlab.config.gravatar.plain_url
-    end
+    gon.api_version = Gitlab::API.version
+    gon.api_token = current_user.private_token if current_user
+    gon.gravatar_url = request.ssl? ? Gitlab.config.gravatar.ssl_url : Gitlab.config.gravatar.plain_url
   end
 end
@@ -11,6 +11,7 @@ Feature: Project Team management
     Then I should be able to see myself in team
     And I should see "Sam" in team list
+  @javascript
   Scenario: Add user to project
     Given I click link "New Team Member"
     And I select "Mike" as "Reporter"
@@ -2,6 +2,7 @@ class ProjectTeamManagement &lt; Spinach::FeatureSteps
   include SharedAuthentication
   include SharedProject
   include SharedPaths
+  include Select2Helper
   Then 'I should be able to see myself in team' do
     page.should have_content(@user.name)
@@ -20,8 +21,9 @@ class ProjectTeamManagement &lt; Spinach::FeatureSteps
   And 'I select "Mike" as "Reporter"' do
     user = User.find_by_name("Mike")
+
+    select2(user.id, from: "#user_ids", multiple: true)
     within "#new_team_member" do
-      select "#{user.name} (#{user.username})", :from => "user_ids"
       select "Reporter", :from => "project_access"
     end
     click_button "Add users"
@@ -2,238 +2,239 @@ class Userteams &lt; Spinach::FeatureSteps
   include SharedAuthentication
   include SharedPaths
   include SharedProject
+  include Select2Helper
-    When 'I do not have teams with me' do
-      UserTeam.with_member(current_user).destroy_all
-    end
+  When 'I do not have teams with me' do
+    UserTeam.with_member(current_user).destroy_all
+  end
-    Then 'I should see dashboard page without teams info block' do
-      page.has_no_css?(".teams-box").must_equal true
-    end
+  Then 'I should see dashboard page without teams info block' do
+    page.has_no_css?(".teams-box").must_equal true
+  end
-    When 'I have teams with my membership' do
-      team = create :user_team, owner: current_user
-      team.add_member(current_user, UserTeam.access_roles["Master"], true)
-    end
+  When 'I have teams with my membership' do
+    team = create :user_team, owner: current_user
+    team.add_member(current_user, UserTeam.access_roles["Master"], true)
+  end
-    Then 'I should see dashboard page with teams information block' do
-      page.should have_css(".teams-box")
-    end
+  Then 'I should see dashboard page with teams information block' do
+    page.should have_css(".teams-box")
+  end
-    When 'exist user teams' do
-      team = create :user_team
-      team.add_member(current_user, UserTeam.access_roles["Master"], true)
-    end
+  When 'exist user teams' do
+    team = create :user_team
+    team.add_member(current_user, UserTeam.access_roles["Master"], true)
+  end
-    And 'I click on "All teams" link' do
-      click_link("All Teams")
-    end
+  And 'I click on "All teams" link' do
+    click_link("All Teams")
+  end
-    Then 'I should see "All teams" page' do
-      current_path.should == teams_path
-    end
+  Then 'I should see "All teams" page' do
+    current_path.should == teams_path
+  end
-    And 'I should see exist teams in teams list' do
-      team = UserTeam.last
-      find_in_list(".teams_list tr", team).must_equal true
-    end
+  And 'I should see exist teams in teams list' do
+    team = UserTeam.last
+    find_in_list(".teams_list tr", team).must_equal true
+  end
-    When 'I click to "New team" link' do
-      click_link("New Team")
-    end
+  When 'I click to "New team" link' do
+    click_link("New Team")
+  end
-    And 'I submit form with new team info' do
-      fill_in 'name', with: 'gitlab'
+  And 'I submit form with new team info' do
+    fill_in 'name', with: 'gitlab'
-      fill_in 'user_team_description', with: 'team description'
-      click_button 'Create team'
-    end
+    fill_in 'user_team_description', with: 'team description'
+    click_button 'Create team'
+  end
-    And 'I should see newly created team' do
-      page.should have_content "gitlab"
-      page.should have_content "team description"
-    end
+  And 'I should see newly created team' do
+    page.should have_content "gitlab"
+    page.should have_content "team description"
+  end
-    Then 'I should be redirected to new team page' do
-      team = UserTeam.last
-      current_path.should == team_path(team)
-    end
+  Then 'I should be redirected to new team page' do
+    team = UserTeam.last
+    current_path.should == team_path(team)
+  end
-    When 'I have teams with projects and members' do
-      team = create :user_team, owner: current_user
-      @project = create :project
-      team.add_member(current_user, UserTeam.access_roles["Master"], true)
-      team.assign_to_project(@project, UserTeam.access_roles["Master"])
-      @event = create(:closed_issue_event, project: @project)
-    end
+  When 'I have teams with projects and members' do
+    team = create :user_team, owner: current_user
+    @project = create :project
+    team.add_member(current_user, UserTeam.access_roles["Master"], true)
+    team.assign_to_project(@project, UserTeam.access_roles["Master"])
+    @event = create(:closed_issue_event, project: @project)
+  end
-    When 'I visit team page' do
-      visit team_path(UserTeam.last)
-    end
+  When 'I visit team page' do
+    visit team_path(UserTeam.last)
+  end
-    Then 'I should see projects list' do
-      page.should have_css(".projects_box")
-      projects_box = find(".projects_box")
-      projects_box.should have_content(@project.name)
-    end
+  Then 'I should see projects list' do
+    page.should have_css(".projects_box")
+    projects_box = find(".projects_box")
+    projects_box.should have_content(@project.name)
+  end
-    And 'project from team has issues assigned to me' do
-      team = UserTeam.last
-      team.projects.each do |project|
-        project.issues << create(:issue, assignee: current_user)
-      end
+  And 'project from team has issues assigned to me' do
+    team = UserTeam.last
+    team.projects.each do |project|
+      project.issues << create(:issue, assignee: current_user)
     end
+  end
-    When 'I visit team issues page' do
-      team = UserTeam.last
-      visit issues_team_path(team)
-    end
+  When 'I visit team issues page' do
+    team = UserTeam.last
+    visit issues_team_path(team)
+  end
-    Then 'I should see issues from this team assigned to me' do
-      team = UserTeam.last
-      team.projects.each do |project|
-        project.issues.assigned(current_user).each do |issue|
-          page.should have_content issue.title
-        end
+  Then 'I should see issues from this team assigned to me' do
+    team = UserTeam.last
+    team.projects.each do |project|
+      project.issues.assigned(current_user).each do |issue|
+        page.should have_content issue.title
       end
     end
+  end
-    Given 'I have team with projects and members' do
-      team = create :user_team, owner: current_user
-      project = create :project
-      user = create :user
-      team.add_member(current_user, UserTeam.access_roles["Master"], true)
-      team.add_member(user, UserTeam.access_roles["Developer"], false)
-      team.assign_to_project(project, UserTeam.access_roles["Master"])
-    end
+  Given 'I have team with projects and members' do
+    team = create :user_team, owner: current_user
+    project = create :project
+    user = create :user
+    team.add_member(current_user, UserTeam.access_roles["Master"], true)
+    team.add_member(user, UserTeam.access_roles["Developer"], false)
+    team.assign_to_project(project, UserTeam.access_roles["Master"])
+  end
-    Given 'project from team has issues assigned to teams members' do
-      team = UserTeam.last
-      team.projects.each do |project|
-        team.members.each do |member|
-          project.issues << create(:issue, assignee: member)
-        end
+  Given 'project from team has issues assigned to teams members' do
+    team = UserTeam.last
+    team.projects.each do |project|
+      team.members.each do |member|
+        project.issues << create(:issue, assignee: member)
       end
     end
+  end
-    Then 'I should see issues from this team assigned to teams members' do
-      team = UserTeam.last
-      team.projects.each do |project|
-        team.members.each do |member|
-          project.issues.assigned(member).each do |issue|
-            page.should have_content issue.title
-          end
+  Then 'I should see issues from this team assigned to teams members' do
+    team = UserTeam.last
+    team.projects.each do |project|
+      team.members.each do |member|
+        project.issues.assigned(member).each do |issue|
+          page.should have_content issue.title
         end
       end
     end
+  end
-    Given 'project from team has merge requests assigned to me' do
-      team = UserTeam.last
-      team.projects.each do |project|
-        team.members.each do |member|
-          3.times { project.merge_requests << create(:merge_request, assignee: member) }
-        end
+  Given 'project from team has merge requests assigned to me' do
+    team = UserTeam.last
+    team.projects.each do |project|
+      team.members.each do |member|
+        3.times { project.merge_requests << create(:merge_request, assignee: member) }
       end
     end
+  end
-    When 'I visit team merge requests page' do
-      team = UserTeam.last
-      visit merge_requests_team_path(team)
-    end
+  When 'I visit team merge requests page' do
+    team = UserTeam.last
+    visit merge_requests_team_path(team)
+  end
-    Then 'I should see merge requests from this team assigned to me' do
-      team = UserTeam.last
-      team.projects.each do |project|
-        team.members.each do |member|
-          project.issues.assigned(member).each do |merge_request|
-            page.should have_content merge_request.title
-          end
+  Then 'I should see merge requests from this team assigned to me' do
+    team = UserTeam.last
+    team.projects.each do |project|
+      team.members.each do |member|
+        project.issues.assigned(member).each do |merge_request|
+          page.should have_content merge_request.title
         end
       end
     end
+  end
-    Given 'project from team has merge requests assigned to team members' do
-      team = UserTeam.last
-      team.projects.each do |project|
-        team.members.each do |member|
-          3.times { project.merge_requests << create(:merge_request, assignee: member) }
-        end
+  Given 'project from team has merge requests assigned to team members' do
+    team = UserTeam.last
+    team.projects.each do |project|
+      team.members.each do |member|
+        3.times { project.merge_requests << create(:merge_request, assignee: member) }
       end
     end
+  end
-    Then 'I should see merge requests from this team assigned to me' do
-      team = UserTeam.last
-      team.projects.each do |project|
-        team.members.each do |member|
-          project.issues.assigned(member).each do |merge_request|
-            page.should have_content merge_request.title
-          end
+  Then 'I should see merge requests from this team assigned to me' do
+    team = UserTeam.last
+    team.projects.each do |project|
+      team.members.each do |member|
+        project.issues.assigned(member).each do |merge_request|
+          page.should have_content merge_request.title
         end
       end
     end
+  end
-    Given 'I have new user "John"' do
-      create :user, name: "John"
-    end
+  Given 'I have new user "John"' do
+    create :user, name: "John"
+  end
-    When 'I visit team people page' do
-      team = UserTeam.last
-      visit team_members_path(team)
-    end
+  When 'I visit team people page' do
+    team = UserTeam.last
+    visit team_members_path(team)
+  end
-    And 'I select user "John" from list with role "Reporter"' do
-      user = User.find_by_name("John")
-      within "#team_members" do
-        select "#{user.name} (#{user.username})", from: "user_ids"
-        select "Reporter", from: "default_project_access"
-      end
-      click_button "Add"
+  And 'I select user "John" from list with role "Reporter"' do
+    user = User.find_by_name("John")
+    select2(user.id, from: "#user_ids", multiple: true)
+    within "#team_members" do
+      select "Reporter", from: "default_project_access"
     end
+    click_button "Add"
+  end
-    Then 'I should see user "John" in team list' do
-      user = User.find_by_name("John")
-      team_members_list = find(".team-table")
-      team_members_list.should have_content user.name
-    end
+  Then 'I should see user "John" in team list' do
+    user = User.find_by_name("John")
+    team_members_list = find(".team-table")
+    team_members_list.should have_content user.name
+  end
-    And 'I have my own project without teams' do
-      @project = create :project, namespace: current_user.namespace
-    end
+  And 'I have my own project without teams' do
+    @project = create :project, namespace: current_user.namespace
+  end
-    And 'I visit my team page' do
-      team = UserTeam.where(owner_id: current_user.id).last
-      visit team_path(team)
-    end
+  And 'I visit my team page' do
+    team = UserTeam.where(owner_id: current_user.id).last
+    visit team_path(team)
+  end
-    When 'I click on link "Projects"' do
-      click_link "Projects"
-    end
+  When 'I click on link "Projects"' do
+    click_link "Projects"
+  end
-    And 'I click link "Assign project to Team"' do
-      click_link "Assign project to Team"
-    end
+  And 'I click link "Assign project to Team"' do
+    click_link "Assign project to Team"
+  end
-    Then 'I should see form with my own project in avaliable projects list' do
-      projects_select = find("#project_ids")
-      projects_select.should have_content(@project.name)
-    end
+  Then 'I should see form with my own project in avaliable projects list' do
+    projects_select = find("#project_ids")
+    projects_select.should have_content(@project.name)
+  end
-    When 'I submit form with selected project and max access' do
-      within "#assign_projects" do
-        select @project.name_with_namespace, from: "project_ids"
-        select "Reporter", from: "greatest_project_access"
-      end
-      click_button "Add"
+  When 'I submit form with selected project and max access' do
+    within "#assign_projects" do
+      select @project.name_with_namespace, from: "project_ids"
+      select "Reporter", from: "greatest_project_access"
     end
+    click_button "Add"
+  end
-    Then 'I should see my own project in team projects list' do
-      projects = find(".projects-table")
-      projects.should have_content(@project.name)
-    end
+  Then 'I should see my own project in team projects list' do
+    projects = find(".projects-table")
+    projects.should have_content(@project.name)
+  end
-    When 'I click link "New Team Member"' do
-      click_link "New Team Member"
-    end
+  When 'I click link "New Team Member"' do
+    click_link "New Team Member"
+  end
   protected
@@ -257,5 +258,4 @@ class Userteams &lt; Spinach::FeatureSteps
     end
     entered
   end
-
 end
@@ -14,7 +14,7 @@ require &#39;spinach/capybara&#39;
 require 'sidekiq/testing/inline'
-%w(stubbed_repository valid_commit).each do |f|
+%w(stubbed_repository valid_commit select2_helper).each do |f|
   require Rails.root.join('spec', 'support', f)
 end
@@ -46,6 +46,7 @@ Feature: UserTeams
     When I visit team merge requests page
     Then I should see merge requests from this team assigned to me
+  @javascript
   Scenario: I should add user to projects in Team
     Given I have team with projects and members
     Given I have new user "John"
@@ -0,0 +1,25 @@
+# Select2 ajax programatic helper
+# It allows you to select value from select2
+#
+# Params
+#   value - real value of selected item
+#   opts - options containing css selector
+#
+# Usage:
+#
+#   select2(2, from: '#user_ids')
+#
+
+module Select2Helper
+  def select2(value, options={})
+    raise "Must pass a hash containing 'from'" if not options.is_a?(Hash) or not options.has_key?(:from)
+
+    selector = options[:from]
+
+    if options[:multiple]
+      page.execute_script("$('#{selector}').select2('val', ['#{value}']);")
+    else
+      page.execute_script("$('#{selector}').select2('val', '#{value}');")
+    end
+  end
+end
	@@ -15,7 +15,7 @@		@@ -15,7 +15,7 @@
15	@import "gitlab_bootstrap.scss";	15	@import "gitlab_bootstrap.scss";
16		16
17	@import "common.scss";	17	@import "common.scss";
18	-@import "ref_select.scss";	18	+@import "selects.scss";
19		19
20	@import "sections/header.scss";	20	@import "sections/header.scss";
21	@import "sections/nav.scss";	21	@import "sections/nav.scss";
	@@ -555,17 +555,3 @@ img.emoji {		@@ -555,17 +555,3 @@ img.emoji {
555	display: none;	555	display: none;
556	}	556	}
557		557
558	-.ajax-users-select {
559	- width: 400px;
560	-}
561	-
562	-.user-result {
563	- .user-image {
564	- float: left;
565	- }
566	- .user-name {
567	- }
568	- .user-username {
569	- color: #999;
570	- }
571	-}
	@@ -1,90 +0,0 @@	@@ -1,90 +0,0 @@
1	-/ Branch/tag selector /
2	-.project-refs-form {
3	- margin: 0;
4	- span {
5	- background:none !important;
6	- position:static !important;
7	- width:auto !important;
8	- height:auto !important;
9	- }
10	-}
11	-.project-refs-select {
12	- width: 120px;
13	-}
14	-
15	-.project-refs-form .chzn-container {
16	- position: relative;
17	- top: 0;
18	- left: 0;
19	- margin-right: 10px;
20	-
21	- .chzn-drop {
22	- min-width: 400px;
23	- .chzn-results {
24	- max-height: 300px;
25	- }
26	- .chzn-search input {
27	- min-width: 365px;
28	- }
29	- }
30	-}
31	-
32	-/ Fix for Search Dropdown Border /
33	-.chzn-container {
34	- .chzn-search {
35	- input:focus {
36	- @include box-shadow(none);
37	- }
38	- }
39	-
40	- .chzn-drop {
41	- margin: 7px 0;
42	- min-width: 200px;
43	- border: 1px solid #bbb;
44	- @include border-radius(0);
45	-
46	- .chzn-results {
47	- margin-top: 5px;
48	- max-height: 300px;
49	-
50	- .group-result {
51	- color: $style_color;
52	- border-bottom: 1px solid #EEE;
53	- padding: 8px;
54	- }
55	- .active-result {
56	- @include border-radius(0);
57	-
58	- &.highlighted {
59	- background: $hover;
60	- color: $style_color;
61	- }
62	- &.result-selected {
63	- background: #EEE;
64	- border-left: 4px solid #CCC;
65	- }
66	- }
67	- }
68	-
69	- .chzn-search {
70	- @include bg-gray-gradient;
71	- input {
72	- min-width: 165px;
73	- border-color: #CCC;
74	- }
75	- }
76	- }
77	-
78	- .chzn-single {
79	- @include bg-light-gray-gradient;
80	-
81	- div {
82	- background: transparent;
83	- border-left: none;
84	- }
85	-
86	- span {
87	- font-weight: normal;
88	- }
89	- }
90	-}
@@ -0,0 +1,110 @@		@@ -0,0 +1,110 @@
	1	+.ajax-users-select {
	2	+ width: 400px;
	3	+}
	4	+
	5	+.user-result {
	6	+ .user-image {
	7	+ float: left;
	8	+ }
	9	+ .user-name {
	10	+ }
	11	+ .user-username {
	12	+ color: #999;
	13	+ }
	14	+}
	15	+
	16	+.select2-no-results {
	17	+ padding: 7px;
	18	+ color: #666;
	19	+}
	20	+
	21	+/ Branch/tag selector /
	22	+.project-refs-form {
	23	+ margin: 0;
	24	+ span {
	25	+ background:none !important;
	26	+ position:static !important;
	27	+ width:auto !important;
	28	+ height:auto !important;
	29	+ }
	30	+}
	31	+.project-refs-select {
	32	+ width: 120px;
	33	+}
	34	+
	35	+.project-refs-form .chzn-container {
	36	+ position: relative;
	37	+ top: 0;
	38	+ left: 0;
	39	+ margin-right: 10px;
	40	+
	41	+ .chzn-drop {
	42	+ min-width: 400px;
	43	+ .chzn-results {
	44	+ max-height: 300px;
	45	+ }
	46	+ .chzn-search input {
	47	+ min-width: 365px;
	48	+ }
	49	+ }
	50	+}
	51	+
	52	+/ Fix for Search Dropdown Border /
	53	+.chzn-container {
	54	+ .chzn-search {
	55	+ input:focus {
	56	+ @include box-shadow(none);
	57	+ }
	58	+ }
	59	+
	60	+ .chzn-drop {
	61	+ margin: 7px 0;
	62	+ min-width: 200px;
	63	+ border: 1px solid #bbb;
	64	+ @include border-radius(0);
	65	+
	66	+ .chzn-results {
	67	+ margin-top: 5px;
	68	+ max-height: 300px;
	69	+
	70	+ .group-result {
	71	+ color: $style_color;
	72	+ border-bottom: 1px solid #EEE;
	73	+ padding: 8px;
	74	+ }
	75	+ .active-result {
	76	+ @include border-radius(0);
	77	+
	78	+ &.highlighted {
	79	+ background: $hover;
	80	+ color: $style_color;
	81	+ }
	82	+ &.result-selected {
	83	+ background: #EEE;
	84	+ border-left: 4px solid #CCC;
	85	+ }
	86	+ }
	87	+ }
	88	+
	89	+ .chzn-search {
	90	+ @include bg-gray-gradient;
	91	+ input {
	92	+ min-width: 165px;
	93	+ border-color: #CCC;
	94	+ }
	95	+ }
	96	+ }
	97	+
	98	+ .chzn-single {
	99	+ @include bg-light-gray-gradient;
	100	+
	101	+ div {
	102	+ background: transparent;
	103	+ border-left: none;
	104	+ }
	105	+
	106	+ span {
	107	+ font-weight: normal;
	108	+ }
	109	+ }
	110	+}
	@@ -11,6 +11,7 @@ Feature: Project Team management		@@ -11,6 +11,7 @@ Feature: Project Team management
11	Then I should be able to see myself in team	11	Then I should be able to see myself in team
12	And I should see "Sam" in team list	12	And I should see "Sam" in team list
13		13
		14	+ @javascript
14	Scenario: Add user to project	15	Scenario: Add user to project
15	Given I click link "New Team Member"	16	Given I click link "New Team Member"
16	And I select "Mike" as "Reporter"	17	And I select "Mike" as "Reporter"
	@@ -14,7 +14,7 @@ require 'spinach/capybara'		@@ -14,7 +14,7 @@ require 'spinach/capybara'
14	require 'sidekiq/testing/inline'	14	require 'sidekiq/testing/inline'
15		15
16		16
17	-%w(stubbed_repository valid_commit).each do \|f\|	17	+%w(stubbed_repository valid_commit select2_helper).each do \|f\|
18	require Rails.root.join('spec', 'support', f)	18	require Rails.root.join('spec', 'support', f)
19	end	19	end
20		20
	@@ -46,6 +46,7 @@ Feature: UserTeams		@@ -46,6 +46,7 @@ Feature: UserTeams
46	When I visit team merge requests page	46	When I visit team merge requests page
47	Then I should see merge requests from this team assigned to me	47	Then I should see merge requests from this team assigned to me
48		48
		49	+ @javascript
49	Scenario: I should add user to projects in Team	50	Scenario: I should add user to projects in Team
50	Given I have team with projects and members	51	Given I have team with projects and members
51	Given I have new user "John"	52	Given I have new user "John"
@@ -0,0 +1,25 @@		@@ -0,0 +1,25 @@
	1	+# Select2 ajax programatic helper
	2	+# It allows you to select value from select2
	3	+#
	4	+# Params
	5	+# value - real value of selected item
	6	+# opts - options containing css selector
	7	+#
	8	+# Usage:
	9	+#
	10	+# select2(2, from: '#user_ids')
	11	+#
	12	+
	13	+module Select2Helper
	14	+ def select2(value, options={})
	15	+ raise "Must pass a hash containing 'from'" if not options.is_a?(Hash) or not options.has_key?(:from)
	16	+
	17	+ selector = options[:from]
	18	+
	19	+ if options[:multiple]
	20	+ page.execute_script("$('#{selector}').select2('val', ['#{value}']);")
	21	+ else
	22	+ page.execute_script("$('#{selector}').select2('val', '#{value}');")
	23	+ end
	24	+ end
	25	+end