Download as
Browse Code »

Commit d65c67d8e33e26a824a91b6b39912b3b1e4b87ce

Authored by Sergey Nartimov
2 parents 5162dea2 9dd1f5df
Exists in master and in 1 other branch production

Merge pull request #321 from nfedyashev/further_gemfile_drying 

DRY a few left dependencies in Gemfile
Showing 4 changed files with 2 additions and 11 deletions   Show diff stats
@@ -4,7 +4,6 @@ gem 'rails', '3.2.8' @@ -4,7 +4,6 @@ gem 'rails', '3.2.8'
4 gem 'mongoid', '~> 2.4.10' 4 gem 'mongoid', '~> 2.4.10'
5 gem 'mongoid_rails_migrations' 5 gem 'mongoid_rails_migrations'
6 gem 'devise', '~> 1.5.3' 6 gem 'devise', '~> 1.5.3'
7 -gem 'nokogiri'  
8 gem 'haml' 7 gem 'haml'
9 gem 'htmlentities', "~> 4.3.0" 8 gem 'htmlentities', "~> 4.3.0"
10 gem 'rack-ssl', :require => 'rack/ssl' # force SSL 9 gem 'rack-ssl', :require => 'rack/ssl' # force SSL
@@ -66,8 +65,6 @@ platform :ruby do @@ -66,8 +65,6 @@ platform :ruby do
66 gem 'bson_ext', '= 1.6.2' 65 gem 'bson_ext', '= 1.6.2'
67 end 66 end
68 67
69 -gem 'omniauth'  
70 -gem 'oa-core'  
71 gem 'ri_cal' 68 gem 'ri_cal'
72 gem 'yajl-ruby', :require => "yajl" 69 gem 'yajl-ruby', :require => "yajl"
73 70
@@ -88,7 +85,6 @@ end @@ -88,7 +85,6 @@ end
88 group :test do 85 group :test do
89 gem 'capybara' 86 gem 'capybara'
90 gem 'launchy' 87 gem 'launchy'
91 - gem 'rspec', '~> 2.6'  
92 gem 'database_cleaner', '~> 0.6.0' 88 gem 'database_cleaner', '~> 0.6.0'
93 gem 'email_spec' 89 gem 'email_spec'
94 gem 'timecop' 90 gem 'timecop'
@@ -169,7 +169,6 @@ GEM @@ -169,7 +169,6 @@ GEM
169 net-ssh-gateway (1.1.0) 169 net-ssh-gateway (1.1.0)
170 net-ssh (>= 1.99.1) 170 net-ssh (>= 1.99.1)
171 nokogiri (1.5.5) 171 nokogiri (1.5.5)
172 - oa-core (0.3.2)  
173 oauth2 (0.8.0) 172 oauth2 (0.8.0)
174 faraday (~> 0.8) 173 faraday (~> 0.8)
175 httpauth (~> 0.1) 174 httpauth (~> 0.1)
@@ -348,10 +347,7 @@ DEPENDENCIES @@ -348,10 +347,7 @@ DEPENDENCIES
348 mongo (= 1.6.2) 347 mongo (= 1.6.2)
349 mongoid (~> 2.4.10) 348 mongoid (~> 2.4.10)
350 mongoid_rails_migrations 349 mongoid_rails_migrations
351 - nokogiri  
352 - oa-core  
353 octokit (~> 1.0.0) 350 octokit (~> 1.0.0)
354 - omniauth  
355 omniauth-github 351 omniauth-github
356 oruen_redmine_client 352 oruen_redmine_client
357 pivotal-tracker 353 pivotal-tracker
@@ -361,7 +357,6 @@ DEPENDENCIES @@ -361,7 +357,6 @@ DEPENDENCIES
361 rails (= 3.2.8) 357 rails (= 3.2.8)
362 rails_autolink (~> 1.0.9) 358 rails_autolink (~> 1.0.9)
363 ri_cal 359 ri_cal
364 - rspec (~> 2.6)  
365 rspec-rails (~> 2.6) 360 rspec-rails (~> 2.6)
366 ruby-debug 361 ruby-debug
367 ruby-fogbugz 362 ruby-fogbugz
spec/interactors/problem_destroy_spec.rb
  Diff comments   View file @d65c67d
@@ -7,7 +7,7 @@ describe ProblemDestroy do @@ -7,7 +7,7 @@ describe ProblemDestroy do
7 7
8 context "in unit way" do 8 context "in unit way" do
9 let(:problem) { 9 let(:problem) {
10 - problem = Problem.new() 10 + problem = Problem.new
11 problem.stub(:errs).and_return(mock(:criteria, :only => [err_1, err_2])) 11 problem.stub(:errs).and_return(mock(:criteria, :only => [err_1, err_2]))
12 problem.stub(:comments).and_return(mock(:criteria, :only => [comment_1, comment_2])) 12 problem.stub(:comments).and_return(mock(:criteria, :only => [comment_1, comment_2]))
13 problem.stub(:delete) 13 problem.stub(:delete)
spec/models/issue_trackers/fogbugz_tracker_spec.rb
  Diff comments   View file @d65c67d
@@ -9,7 +9,7 @@ describe IssueTrackers::FogbugzTracker do @@ -9,7 +9,7 @@ describe IssueTrackers::FogbugzTracker do
9 number = 123 9 number = 123
10 @issue_link = "https://#{tracker.account}.fogbugz.com/default.asp?#{number}" 10 @issue_link = "https://#{tracker.account}.fogbugz.com/default.asp?#{number}"
11 response = "<response><token>12345</token><case><ixBug>123</ixBug></case></response>" 11 response = "<response><token>12345</token><case><ixBug>123</ixBug></case></response>"
12 - http_mock = mock() 12 + http_mock = mock
13 http_mock.should_receive(:new).and_return(http_mock) 13 http_mock.should_receive(:new).and_return(http_mock)
14 http_mock.should_receive(:request).twice.and_return(response) 14 http_mock.should_receive(:request).twice.and_return(response)
15 Fogbugz.adapter[:http] = http_mock 15 Fogbugz.adapter[:http] = http_mock