summaryrefslogtreecommitdiff
path: root/spec/observers
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-01-02 19:46:06 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-01-02 19:46:06 +0200
commitccf0686b01160e4a61bf8fb4b26f43d1486af9c2 (patch)
tree6a07765f325ad4249ba59680bc6c87b35926c9bd /spec/observers
parentd431e4339269041784986da40a0e0879baaf96a9 (diff)
downloadgitlab-ce-ccf0686b01160e4a61bf8fb4b26f43d1486af9c2.tar.gz
Fix api specs. Use id instead path
Diffstat (limited to 'spec/observers')
-rw-r--r--spec/observers/user_observer_spec.rb5
-rw-r--r--spec/observers/users_project_observer_spec.rb17
2 files changed, 5 insertions, 17 deletions
diff --git a/spec/observers/user_observer_spec.rb b/spec/observers/user_observer_spec.rb
index 4ba0f05df5d..befb980fdcb 100644
--- a/spec/observers/user_observer_spec.rb
+++ b/spec/observers/user_observer_spec.rb
@@ -6,10 +6,7 @@ describe UserObserver do
it 'calls #after_create when new users are created' do
new_user = build(:user)
subject.should_receive(:after_create).with(new_user)
-
- User.observers.enable :user_observer do
- new_user.save
- end
+ new_user.save
end
context 'when a new user is created' do
diff --git a/spec/observers/users_project_observer_spec.rb b/spec/observers/users_project_observer_spec.rb
index 548f1893848..9cf629214ab 100644
--- a/spec/observers/users_project_observer_spec.rb
+++ b/spec/observers/users_project_observer_spec.rb
@@ -11,9 +11,7 @@ describe UsersProjectObserver do
describe "#after_commit" do
it "should called when UsersProject created" do
subject.should_receive(:after_commit).once
- UsersProject.observers.enable :users_project_observer do
- create(:users_project)
- end
+ create(:users_project)
end
it "should send email to user" do
@@ -36,9 +34,7 @@ describe UsersProjectObserver do
describe "#after_update" do
it "should called when UsersProject updated" do
subject.should_receive(:after_commit).once
- UsersProject.observers.enable :users_project_observer do
- create(:users_project).update_attribute(:project_access, UsersProject::MASTER)
- end
+ create(:users_project).update_attribute(:project_access, UsersProject::MASTER)
end
it "should send email to user" do
@@ -47,19 +43,14 @@ describe UsersProjectObserver do
end
it "should not called after UsersProject destroyed" do
subject.should_not_receive(:after_commit)
- UsersProject.observers.enable :users_project_observer do
- users_project.destroy
- end
+ users_project.destroy
end
end
describe "#after_destroy" do
it "should called when UsersProject destroyed" do
subject.should_receive(:after_destroy)
-
- UsersProject.observers.enable :users_project_observer do
- create(:users_project).destroy
- end
+ create(:users_project).destroy
end
it "should create new event" do