Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2015-09-15 21:56:20 +0300
committerKamil Trzcinski <ayufan@ayufan.eu>2015-09-15 21:56:20 +0300
commita598bd91f9b5ec70d04d70f481c4f5b277f05904 (patch)
tree36e61c612acf7ece21abbca99d81b9b5e71d67bf
parent6d0980b011656b1570c94be8b3baf78c089f6bbd (diff)
Refactor ci_admin_event and fix features/ci/events_spec.rb
-rw-r--r--spec/factories/ci/events.rb2
-rw-r--r--spec/features/ci/admin/events_spec.rb2
-rw-r--r--spec/features/ci/events_spec.rb4
3 files changed, 4 insertions, 4 deletions
diff --git a/spec/factories/ci/events.rb b/spec/factories/ci/events.rb
index 03450751596..9638618a400 100644
--- a/spec/factories/ci/events.rb
+++ b/spec/factories/ci/events.rb
@@ -17,7 +17,7 @@ FactoryGirl.define do
"updated project settings#{n}"
end
- factory :admin_event do
+ factory :ci_admin_event do
is_admin true
end
end
diff --git a/spec/features/ci/admin/events_spec.rb b/spec/features/ci/admin/events_spec.rb
index 6b6ace06c53..a7e75cc4f6b 100644
--- a/spec/features/ci/admin/events_spec.rb
+++ b/spec/features/ci/admin/events_spec.rb
@@ -1,7 +1,7 @@
require 'spec_helper'
describe "Admin Events" do
- let(:event) { FactoryGirl.create :admin_event }
+ let(:event) { FactoryGirl.create :ci_admin_event }
before do
skip_ci_admin_auth
diff --git a/spec/features/ci/events_spec.rb b/spec/features/ci/events_spec.rb
index dd13d7d66dc..8142eaff274 100644
--- a/spec/features/ci/events_spec.rb
+++ b/spec/features/ci/events_spec.rb
@@ -2,13 +2,13 @@ require 'spec_helper'
describe "Events" do
let(:project) { FactoryGirl.create :ci_project }
- let(:event) { FactoryGirl.create :admin_event, project: project }
+ let(:event) { FactoryGirl.create :ci_admin_event, project: project }
before do
login_as :user
end
- describe "GET /project/:id/events" do
+ describe "GET /ci/project/:id/events" do
before do
event
visit ci_project_events_path(project)