diff --git a/app/assets/javascripts/admin/teams/members.js.coffee b/app/assets/javascripts/admin/teams/members.js.coffee new file mode 100644 index 00000000..76156794 --- /dev/null +++ b/app/assets/javascripts/admin/teams/members.js.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/ diff --git a/app/assets/stylesheets/admin/teams/members.css.scss b/app/assets/stylesheets/admin/teams/members.css.scss new file mode 100644 index 00000000..47c2273c --- /dev/null +++ b/app/assets/stylesheets/admin/teams/members.css.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the Admin::Teams::Members controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/helpers/admin/teams/members_helper.rb b/app/helpers/admin/teams/members_helper.rb new file mode 100644 index 00000000..58b9f189 --- /dev/null +++ b/app/helpers/admin/teams/members_helper.rb @@ -0,0 +1,5 @@ +module Admin::Teams::MembersHelper + def member_since(team, member) + team.user_team_user_relationships.find_by_user_id(member).created_at + end +end diff --git a/config/routes.rb b/config/routes.rb index b15431e3..a31d0e77 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,7 +1,6 @@ require 'sidekiq/web' Gitlab::Application.routes.draw do - # # Search # diff --git a/spec/controllers/admin/teams/members_controller_spec.rb b/spec/controllers/admin/teams/members_controller_spec.rb new file mode 100644 index 00000000..a9e41be5 --- /dev/null +++ b/spec/controllers/admin/teams/members_controller_spec.rb @@ -0,0 +1,40 @@ +require 'spec_helper' + +describe Admin::Teams::MembersController do + + describe "GET 'new'" do + it "returns http success" do + get 'new' + response.should be_success + end + end + + describe "GET 'create'" do + it "returns http success" do + get 'create' + response.should be_success + end + end + + describe "GET 'edit'" do + it "returns http success" do + get 'edit' + response.should be_success + end + end + + describe "GET 'update'" do + it "returns http success" do + get 'update' + response.should be_success + end + end + + describe "GET 'destroy'" do + it "returns http success" do + get 'destroy' + response.should be_success + end + end + +end diff --git a/spec/helpers/admin/teams/members_helper_spec.rb b/spec/helpers/admin/teams/members_helper_spec.rb new file mode 100644 index 00000000..ceef71c0 --- /dev/null +++ b/spec/helpers/admin/teams/members_helper_spec.rb @@ -0,0 +1,15 @@ +require 'spec_helper' + +# Specs in this file have access to a helper object that includes +# the Admin::Teams::MembersHelper. For example: +# +# describe Admin::Teams::MembersHelper do +# describe "string concat" do +# it "concats two strings with spaces" do +# helper.concat_strings("this","that").should == "this that" +# end +# end +# end +describe Admin::Teams::MembersHelper do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/views/admin/teams/members/create.html.haml_spec.rb b/spec/views/admin/teams/members/create.html.haml_spec.rb new file mode 100644 index 00000000..b6f81761 --- /dev/null +++ b/spec/views/admin/teams/members/create.html.haml_spec.rb @@ -0,0 +1,5 @@ +require 'spec_helper' + +describe "members/create.html.haml" do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/views/admin/teams/members/destroy.html.haml_spec.rb b/spec/views/admin/teams/members/destroy.html.haml_spec.rb new file mode 100644 index 00000000..3ff16344 --- /dev/null +++ b/spec/views/admin/teams/members/destroy.html.haml_spec.rb @@ -0,0 +1,5 @@ +require 'spec_helper' + +describe "members/destroy.html.haml" do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/views/admin/teams/members/edit.html.haml_spec.rb b/spec/views/admin/teams/members/edit.html.haml_spec.rb new file mode 100644 index 00000000..3e952e89 --- /dev/null +++ b/spec/views/admin/teams/members/edit.html.haml_spec.rb @@ -0,0 +1,5 @@ +require 'spec_helper' + +describe "members/edit.html.haml" do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/views/admin/teams/members/new.html.haml_spec.rb b/spec/views/admin/teams/members/new.html.haml_spec.rb new file mode 100644 index 00000000..f03eed1f --- /dev/null +++ b/spec/views/admin/teams/members/new.html.haml_spec.rb @@ -0,0 +1,5 @@ +require 'spec_helper' + +describe "members/new.html.haml" do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/views/admin/teams/members/update.html.haml_spec.rb b/spec/views/admin/teams/members/update.html.haml_spec.rb new file mode 100644 index 00000000..43b84bad --- /dev/null +++ b/spec/views/admin/teams/members/update.html.haml_spec.rb @@ -0,0 +1,5 @@ +require 'spec_helper' + +describe "members/update.html.haml" do + pending "add some examples to (or delete) #{__FILE__}" +end