socialcast-git-extensions 3.1.17 → 3.1.18

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: b008a4a9b2357de82f9e62a7fa5ef31fd9e705b3
4
- data.tar.gz: b30af5a791a45d3283cc79c54ff34ca2dc5fdd88
3
+ metadata.gz: 142609028c21b207ad08dba1ea5deb4c4e6fa7a5
4
+ data.tar.gz: 5695fa13f1c2f90ba56232412f83ed94ccb1ea8a
5
5
  SHA512:
6
- metadata.gz: 9eac64d626bf695194df42d14631f7d192d1b8524571916edecdb45b7a0c245097664e65d055c9f4b39779ec885731472b63b1479c181c57fb8af03777d9bf89
7
- data.tar.gz: 80a3e05443dc8a8264754411d32b604b37338f0294674b4e69d3096313cd628cc36889c07bcecea5aa5106f1d9f32a1bf1f43236687fadfe30721b08df061c6f
6
+ metadata.gz: 94e20e9c1c07a4177e149603df027c1c2f597e95fdd088875f697a37b4123f9ef02d658177cd29582acf340134970764a8168a7246d723fa19b4c46d45e0f811
7
+ data.tar.gz: 36d9ee894930c6cd47a7bff87ee065ba6f760bf8581287b51c6f903cb76d375db620a7ddf706d97a16cf56a682f23e8b015a9a36e0281d7b498bf2b5776d65db
@@ -10,7 +10,7 @@ module Socialcast
10
10
  end
11
11
 
12
12
  def assert_in_last_known_good_staging(branch)
13
- branches_in_last_known_staging = branches(:remote => true, :merged => last_known_good_staging_branch)
13
+ branches_in_last_known_staging = branches(:remote => true, :merged => "origin/#{last_known_good_staging_branch}")
14
14
  unless branches_in_last_known_staging.include? branch
15
15
  raise "Cannot release #{branch} unless it has already been promoted separately to #{staging_branch} and the build has passed."
16
16
  end
@@ -1,5 +1,5 @@
1
1
  module Socialcast
2
2
  module Gitx
3
- VERSION = "3.1.17"
3
+ VERSION = "3.1.18"
4
4
  end
5
5
  end
data/spec/cli_spec.rb CHANGED
@@ -156,7 +156,7 @@ describe Socialcast::Gitx::CLI do
156
156
  describe '#release' do
157
157
  let(:branches_in_last_known_good_staging) { ['FOO'] }
158
158
  before do
159
- expect_any_instance_of(Socialcast::Gitx::CLI).to receive(:branches).with(:remote => true, :merged => 'last_known_good_staging').and_return(branches_in_last_known_good_staging)
159
+ expect_any_instance_of(Socialcast::Gitx::CLI).to receive(:branches).with(:remote => true, :merged => 'origin/last_known_good_staging').and_return(branches_in_last_known_good_staging)
160
160
  end
161
161
 
162
162
  context 'when user rejects release' do
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: socialcast-git-extensions
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.1.17
4
+ version: 3.1.18
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ryan Sonnek
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-06-18 00:00:00.000000000 Z
11
+ date: 2014-06-19 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: grit