Eliminate some simple rubocop warnings

nesquena · Oct 27, 2016 · 0f65015 · 0f65015
1 parent 3cbde30
commit 0f65015
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 28 deletions.
diff --git a/test/integration/cli/full_sync_test.rb b/test/integration/cli/full_sync_test.rb
@@ -42,26 +42,26 @@
   # FIXME: This test is so timing dependent I have not been able to make it
   # reliable. I am commenting it out for the moment, and someone can revisit
   # it in the future.
-#  it 'should mark unresolvable conflicts' do
-#    # HACK: This scenario is so dependent upon timing, that is does not run
-#    # reliably on TravisCI, even when it is passing locally.
-#    # So skip it.
-#    next if ENV['TRAVIS']
-#
-#    GitFactory.write(:clone1, 'file', 'testing')
-#    assert_clean(:clone1)
-#
-#    GitFactory.append(:clone2, 'file', 'foobar')
-#    GitFactory.append(:clone3, 'file', 'deadbeef')
-#    assert_clean(:clone2)
-#    assert_clean(:clone3)
-#
-#    %w(clone2 clone3 clone1).each do |repo_name|
-#      assert_file_exist(repo_name, 'file (9a2c773)')
-#      assert_file_exist(repo_name, 'file (f6ea049)')
-#      assert_file_exist(repo_name, 'file (e8b5f82)')
-#    end
-#  end
+  # it 'should mark unresolvable conflicts' do
+  #   # HACK: This scenario is so dependent upon timing, that is does not run
+  #   # reliably on TravisCI, even when it is passing locally.
+  #   # So skip it.
+  #   next if ENV['TRAVIS']
+  #
+  #   GitFactory.write(:clone1, 'file', 'testing')
+  #   assert_clean(:clone1)
+  #
+  #   GitFactory.append(:clone2, 'file', 'foobar')
+  #   GitFactory.append(:clone3, 'file', 'deadbeef')
+  #   assert_clean(:clone2)
+  #   assert_clean(:clone3)
+  #
+  #   %w(clone2 clone3 clone1).each do |repo_name|
+  #     assert_file_exist(repo_name, 'file (9a2c773)')
+  #     assert_file_exist(repo_name, 'file (f6ea049)')
+  #     assert_file_exist(repo_name, 'file (e8b5f82)')
+  #   end
+  # end
 end
 
 ################################################################################

diff --git a/test/integration/test_helper.rb b/test/integration/test_helper.rb
@@ -18,7 +18,7 @@
 Capybara.app_host              = 'http://127.0.0.1:7777/'
 Capybara.default_driver        = :poltergeist
 Capybara.run_server            = false
-Capybara.default_max_wait_time = ENV['TRAVIS'] ? 120 : 120
+Capybara.default_max_wait_time = 120
 
 Capybara.register_driver :poltergeist do |app|
   Capybara::Poltergeist::Driver.new(

diff --git a/test/support/git_factory.rb b/test/support/git_factory.rb
@@ -164,7 +164,7 @@ def bare_commit(repo_name, filename, content, author_id = 0)
       index.add(
         path: filename,
         oid:  repo.write(content, :blob),
-        mode: 0100644
+        mode: 0o100644
       )
 
       author_hash = {

diff --git a/test/unit/browser_app_test.rb b/test/unit/browser_app_test.rb
@@ -64,14 +64,14 @@ def app
 
     describe 'not empty' do
       let(:results) do
-        descriptor1    = stub(name: 'repo1', index: 'index1')
-        search_result1 = stub(file: 'filename1', context: 'context1')
-        descriptor2    = stub(name: 'repo2', index: 'index2')
-        search_result2 = stub(file: 'filename2', context: 'context2')
+        descriptor1 = stub(name: 'repo1', index: 'index1')
+        result1     = stub(file: 'filename1', context: 'context1')
+        descriptor2 = stub(name: 'repo2', index: 'index2')
+        result2     = stub(file: 'filename2', context: 'context2')
 
         {
-          descriptor1 => [search_result1],
-          descriptor2 => [search_result2]
+          descriptor1 => [result1],
+          descriptor2 => [result2]
         }
       end
       specify do