Fixing specs & spinach since Wiki model does not exists any more

Dmitriy Zaporozhets
1 parent 001f3bc5
Showing 5 changed files with 2 additions and 26 deletions Show diff stats
features/dashboard/search.feature
features/steps/dashboard/dashboard_search.rb
spec/factories.rb
spec/services/notification_service_spec.rb
spec/services/project_transfer_service_spec.rb
@@ -2,13 +2,8 @@ Feature: Dashboard Search
   Background:
     Given I sign in as a user
     And I own project "Shop"
-    And Project "Shop" has wiki page "Contibuting guide"
     And I visit dashboard search page
  
   Scenario: I should see project I am looking for
     Given I search for "Sho"
     Then I should see "Shop" project link
-
-  Scenario: I should see wiki page I am looking for
-    Given I search for "Contibuting"
-    Then I should see "Contibuting guide" wiki link
 \ No newline at end of file
@@ -16,15 +16,4 @@ class DashboardSearch &lt; Spinach::FeatureSteps
     fill_in "dashboard_search", with: "Contibuting"
     click_button "Search"
   end
-
-  And 'Project "Shop" has wiki page "Contibuting guide"' do
-    @wiki_page = create :wiki,
-      project: @project,
-      title: "Contibuting guide",
-      slug: "contributing"
-  end
-
-  Then 'I should see "Contibuting guide" wiki link' do
-    page.should have_link "Contibuting guide"
-  end
 end
@@ -198,12 +198,6 @@ FactoryGirl.define do
     url
   end
  
-  factory :wiki do
-    title
-    content
-    user
-  end
-
   factory :snippet do
     project
     author
 require 'spec_helper'
  
 describe NotificationService do
-  # Disable observers to prevent factory trigger notification service
-  before(:all) { ActiveRecord::Base.observers.disable :all }
-  after(:all) { ActiveRecord::Base.observers.enable :all }
-
   let(:notification) { NotificationService.new }
  
   describe 'Keys' do
 require 'spec_helper'
  
 describe ProjectTransferService do
+  before(:each) { enable_observers }
+
   context 'namespace -> namespace' do
     let(:user) { create(:user) }
     let(:group) { create(:group) }
...	...	@@ -2,13 +2,8 @@ Feature: Dashboard Search
2	2	Background:
3	3	Given I sign in as a user
4	4	And I own project "Shop"
5		- And Project "Shop" has wiki page "Contibuting guide"
6	5	And I visit dashboard search page
7	6
8	7	Scenario: I should see project I am looking for
9	8	Given I search for "Sho"
10	9	Then I should see "Shop" project link
11		-
12		- Scenario: I should see wiki page I am looking for
13		- Given I search for "Contibuting"
14		- Then I should see "Contibuting guide" wiki link
15	10	\ No newline at end of file
...	...
...	...	@@ -16,15 +16,4 @@ class DashboardSearch < Spinach::FeatureSteps
16	16	fill_in "dashboard_search", with: "Contibuting"
17	17	click_button "Search"
18	18	end
19		-
20		- And 'Project "Shop" has wiki page "Contibuting guide"' do
21		- @wiki_page = create :wiki,
22		- project: @project,
23		- title: "Contibuting guide",
24		- slug: "contributing"
25		- end
26		-
27		- Then 'I should see "Contibuting guide" wiki link' do
28		- page.should have_link "Contibuting guide"
29		- end
30	19	end
...	...
...	...	@@ -198,12 +198,6 @@ FactoryGirl.define do
198	198	url
199	199	end
200	200
201		- factory :wiki do
202		- title
203		- content
204		- user
205		- end
206		-
207	201	factory :snippet do
208	202	project
209	203	author
...	...
1	1	require 'spec_helper'
2	2
3	3	describe NotificationService do
4		- # Disable observers to prevent factory trigger notification service
5		- before(:all) { ActiveRecord::Base.observers.disable :all }
6		- after(:all) { ActiveRecord::Base.observers.enable :all }
7		-
8	4	let(:notification) { NotificationService.new }
9	5
10	6	describe 'Keys' do
...	...
1	1	require 'spec_helper'
2	2
3	3	describe ProjectTransferService do
	4	+ before(:each) { enable_observers }
	5	+
4	6	context 'namespace -> namespace' do
5	7	let(:user) { create(:user) }
6	8	let(:group) { create(:group) }
...	...