Permalink
Browse files

Merge branch 'unmerged' of github.com:marshally/rspec-rails-uncommitt…

…ed into unmerged

Conflicts:
	lib/rspec/rails/uncommitted/tasks/rspec.rake
  • Loading branch information...
2 parents 3a3f8fd + c47c1ee commit 3650ec619f0c8e01e6259493ca147c8c263255de @marshally committed May 15, 2012
Showing with 7 additions and 0 deletions.
  1. +7 −0 lib/rspec/rails/uncommitted/tasks/rspec.rake
@@ -36,6 +36,7 @@ def unmerged(branch="master")
end
end
+<<<<<<< HEAD
def current_branch
git_status[/On branch ([^\s]+)/, 1]
end
@@ -45,6 +46,9 @@ def git_status
end
def specs_to_run(changed)
+=======
+def specs_to_run
+>>>>>>> c47c1eedbfd3c35132c981d390573077dacde7d5
# cribbed from rails/railties/lib/rails/test_unit/testing.rake
models = changed.select { |path| path =~ /app[\\\/]models[\\\/].*\.rb$/ }
controllers = changed.select { |path| path =~ /app[\\\/]controllers[\\\/].*\.rb$/ }
@@ -67,10 +71,13 @@ namespace :spec do
RSpec::Core::RakeTask.new(:unmerged => spec_prereq) do |t|
t.pattern = specs_to_run unmerged
end
+<<<<<<< HEAD
desc "Run unpushed specs"
RSpec::Core::RakeTask.new(:unpushed => spec_prereq) do |t|
t.pattern = specs_to_run unpushed
end
+=======
+>>>>>>> c47c1eedbfd3c35132c981d390573077dacde7d5
end

0 comments on commit 3650ec6

Please sign in to comment.