summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorWild Kat <wk@futureinquestion.net>2018-04-21 13:27:05 +0200
committerWild Kat <wk@futureinquestion.net>2018-04-21 13:35:54 +0200
commit21e3d6490496573f25ef77fe8172766ac7d1a736 (patch)
tree785e5243f5f7ffe7e5a4bfcde551ec04c723b2ae /spec
parent2648b1bb271727976e2d96123fcd51d52af39f79 (diff)
the great makeover - standardize layout, alignment, indentation
Diffstat (limited to 'spec')
-rw-r--r--spec/cli_spec.rb8
-rw-r--r--spec/githubrepo_spec.rb2
2 files changed, 5 insertions, 5 deletions
diff --git a/spec/cli_spec.rb b/spec/cli_spec.rb
index bf6058a..4ceb8ed 100644
--- a/spec/cli_spec.rb
+++ b/spec/cli_spec.rb
@@ -2,11 +2,11 @@ require 'spec_helper'
require 'oxidized/cli'
describe Oxidized::CLI do
- before(:each) do
- @original = ARGV
- Oxidized.asetus = Asetus.new
+ before(:each) do
+ @original = ARGV
+ Oxidized.asetus = Asetus.new
end
-
+
after(:each) do
ARGV.replace @original
end
diff --git a/spec/githubrepo_spec.rb b/spec/githubrepo_spec.rb
index baa9a14..67c99f0 100644
--- a/spec/githubrepo_spec.rb
+++ b/spec/githubrepo_spec.rb
@@ -70,7 +70,7 @@ describe GithubRepo do
repo_head.expects(:target).returns("our_target")
merge_index.expects(:write_tree).with(repo).returns("tree")
merge_index.expects(:conflicts?).returns(false)
- Rugged::Commit.expects(:create).with(repo,
+ Rugged::Commit.expects(:create).with(repo,
parents: ["our_target", "their_target"],
tree: "tree",
message: "Merge remote-tracking branch 'origin/master'",