summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-11-23 21:11:09 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-11-23 21:11:09 +0300
commitc50ec72b52e9ed7270f7c81c2c71fd8e5a28eeb0 (patch)
tree48c30a44b85b84a4231bff84e51133e7812b55ca /spec
parentab9d02365181df373beffbe7732b36b9b3f7a307 (diff)
downloadgitlab-ce-c50ec72b52e9ed7270f7c81c2c71fd8e5a28eeb0.tar.gz
Deprecate code for Project. Use title and path
Diffstat (limited to 'spec')
-rw-r--r--spec/factories.rb1
-rw-r--r--spec/observers/user_observer_spec.rb2
-rw-r--r--spec/routing/admin_routing_spec.rb8
3 files changed, 2 insertions, 9 deletions
diff --git a/spec/factories.rb b/spec/factories.rb
index a49cd69ec69..51b4c5c9f91 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -12,6 +12,7 @@ FactoryGirl.define do
factory :user, aliases: [:author, :assignee, :owner] do
email { Faker::Internet.email }
name
+ username 'john'
password "123456"
password_confirmation { password }
diff --git a/spec/observers/user_observer_spec.rb b/spec/observers/user_observer_spec.rb
index 08254f44026..ea5cf7975b1 100644
--- a/spec/observers/user_observer_spec.rb
+++ b/spec/observers/user_observer_spec.rb
@@ -13,7 +13,7 @@ describe UserObserver do
end
context 'when a new user is created' do
- let(:user) { double(:user, id: 42, password: 'P@ssword!', name: 'John', email: 'u@mail.local') }
+ let(:user) { double(:user, id: 42, password: 'P@ssword!', name: 'John', email: 'u@mail.local', username: 'root') }
let(:notification) { double :notification }
it 'sends an email' do
diff --git a/spec/routing/admin_routing_spec.rb b/spec/routing/admin_routing_spec.rb
index 60261c7ae71..fb26bf98d0f 100644
--- a/spec/routing/admin_routing_spec.rb
+++ b/spec/routing/admin_routing_spec.rb
@@ -78,14 +78,6 @@ describe Admin::ProjectsController, "routing" do
get("/admin/projects").should route_to('admin/projects#index')
end
- it "to #create" do
- post("/admin/projects").should route_to('admin/projects#create')
- end
-
- it "to #new" do
- get("/admin/projects/new").should route_to('admin/projects#new')
- end
-
it "to #edit" do
get("/admin/projects/gitlab/edit").should route_to('admin/projects#edit', id: 'gitlab')
end