Download as
Browse Code »

Commit 892f430c91c484873a79c78f67f2757ee02a62bd

Authored by Leandro Santos
1 parent 21153d13
Exists in master and in 27 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, temp_ratings, tests, tests_fixies

removing eventmachine from Gemfile.lock and adding mocha lib to Gemfile test group

Showing 2 changed files with 6 additions and 1 deletions   Show diff stats
@@ -26,6 +26,7 @@ end @@ -26,6 +26,7 @@ end
26 group :test do 26 group :test do
27 gem 'rspec' 27 gem 'rspec'
28 gem 'rspec-rails' 28 gem 'rspec-rails'
  29 + gem 'mocha'
29 end 30 end
30 31
31 group :cucumber do 32 group :cucumber do
@@ -61,7 +61,7 @@ GEM @@ -61,7 +61,7 @@ GEM
61 database_cleaner (1.2.0) 61 database_cleaner (1.2.0)
62 diff-lcs (1.1.3) 62 diff-lcs (1.1.3)
63 erubis (2.7.0) 63 erubis (2.7.0)
64 - eventmachine (0.12.11) 64 + eventmachine (1.0.3)
65 fast_gettext (0.6.8) 65 fast_gettext (0.6.8)
66 ffi (1.0.11) 66 ffi (1.0.11)
67 gherkin (2.4.21) 67 gherkin (2.4.21)
@@ -75,7 +75,10 @@ GEM @@ -75,7 +75,10 @@ GEM
75 i18n (>= 0.4.0) 75 i18n (>= 0.4.0)
76 mime-types (~> 1.16) 76 mime-types (~> 1.16)
77 treetop (~> 1.4.8) 77 treetop (~> 1.4.8)
  78 + metaclass (0.0.4)
78 mime-types (1.19) 79 mime-types (1.19)
  80 + mocha (0.11.3)
  81 + metaclass (~> 0.0.1)
79 multi_json (1.3.6) 82 multi_json (1.3.6)
80 nokogiri (1.5.5) 83 nokogiri (1.5.5)
81 pg (0.13.2) 84 pg (0.13.2)
@@ -164,6 +167,7 @@ DEPENDENCIES @@ -164,6 +167,7 @@ DEPENDENCIES
164 database_cleaner 167 database_cleaner
165 fast_gettext 168 fast_gettext
166 hpricot 169 hpricot
  170 + mocha
167 nokogiri 171 nokogiri
168 pg 172 pg
169 prototype-rails 173 prototype-rails